saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-16 09:40:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some more debugging in install_ubuntu_restart_daemons.

Browse source
This commit is contained in:
Pedro Algarvio 2013-03-17 22:45:31 +00:00
parent c875278630
commit 58b86bd11a
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
bootstrap-salt.sh
View file

@ -935,16 +935,23 @@ install_ubuntu_restart_daemons() {
# upstart knows about this service, let's stop and start it.
# We could restart but earlier versions of the upstart script
# did not support restart, so, it's safer this way
/sbin/initctl stop salt-$fname
/sbin/initctl stop salt-$fname || echodebug "Failed to stop salt-$fname"
/sbin/initctl start salt-$fname
[ $? -eq 0 ] && continue
# We failed to start the service, let's test the SysV code bellow
echodebug "Failed to stop/start salt-$fname"
echodebug "Failed to start salt-$fname"
fi
fi
if [ ! -f /etc/init.d/salt-$fname ]
echoerror "No init.d support for salt-$fname was found"
return 1
fi
/etc/init.d/salt-$fname stop > /dev/null 2>&1
/etc/init.d/salt-$fname start
done
return 0
}
#
# End of Ubuntu Install Functions

6
tests/bootstrap/test_install.py
View file

@ -231,7 +231,7 @@ class InstallationTestCase(BootstrapTestCase):
)
def test_install_daily(self):
args = ['-D']
args = []
if GRAINS['os'] in OS_REQUIRES_PIP_ALLOWED:
args.append('-P')
@ -325,7 +325,7 @@ class InstallationTestCase(BootstrapTestCase):
if GRAINS['os'] in OS_REQUIRES_PIP_ALLOWED:
args.append('-P')
args.extend(['git', 'v0.13.1'])
args.extend(['git', 'v0.13.2'])
self.assert_script_result(
'Failed to install using specific git tag',
@ -555,7 +555,7 @@ class InstallationTestCase(BootstrapTestCase):
if GRAINS['os'] in OS_REQUIRES_PIP_ALLOWED:
args.append('-P')
args.extend(['git', 'v0.13.1'])
args.extend(['git', 'v0.13.2'])
self.assert_script_result(
'Failed to install using specific git tag',