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

Simplify and fixup Ubuntu upstart usage

Browse source 
On at least Linux Mint, need to reload upstart configuration after
installing a salt component.

Using the upstart 'status' command to check if a config exists is
unreliable (e.g. a running job with a removed config will give an
okay status)
This commit is contained in:
Alex Van't Hof 2013-07-26 21:19:04 -04:00
parent ebd18e2db0
commit 5270d36bd7
1 changed files with 15 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
bootstrap-salt.sh
View file

@ -1154,15 +1154,14 @@ install_ubuntu_git_post() {
[ $fname = "syndic" ] && [ $INSTALL_SYNDIC -eq $BS_FALSE ] && continue [ $fname = "syndic" ] && [ $INSTALL_SYNDIC -eq $BS_FALSE ] && continue
if [ -f /sbin/initctl ]; then if [ -f /sbin/initctl ]; then
_upstart_conf="/etc/init/salt-$fname.conf"
# We have upstart support # We have upstart support
echodebug "There's upstart support" echodebug "There's upstart support"
/sbin/initctl status salt-$fname > /dev/null 2>&1 if [ ! -f $_upstart_conf ]; then
if [ $? -eq 1 ]; then
# upstart does not know about our service, let's copy the proper file # upstart does not know about our service, let's copy the proper file
echowarn "Upstart does not apparently know anything about salt-$fname" echowarn "Upstart does not appear to know about salt-$fname"
echodebug "Copying ${SALT_GIT_CHECKOUT_DIR}/pkg/salt-$fname.upstart to /etc/init/salt-$fname.conf" echodebug "Copying ${SALT_GIT_CHECKOUT_DIR}/pkg/salt-$fname.upstart to $_upstart_conf"
copyfile ${SALT_GIT_CHECKOUT_DIR}/pkg/salt-$fname.upstart /etc/init/salt-$fname.conf copyfile ${SALT_GIT_CHECKOUT_DIR}/pkg/salt-$fname.upstart $_upstart_conf
fi fi
# No upstart support in Ubuntu!? # No upstart support in Ubuntu!?
elif [ -f ${SALT_GIT_CHECKOUT_DIR}/debian/salt-$fname.init ]; then elif [ -f ${SALT_GIT_CHECKOUT_DIR}/debian/salt-$fname.init ]; then
@ -1178,6 +1177,8 @@ install_ubuntu_git_post() {
} }
install_ubuntu_restart_daemons() { install_ubuntu_restart_daemons() {
# Ensure upstart configs are loaded
[ -f /sbin/initctl ] && /sbin/initctl reload-configuration
for fname in minion master syndic; do for fname in minion master syndic; do
# Skip if not meant to be installed # Skip if not meant to be installed
@ -1187,28 +1188,16 @@ install_ubuntu_restart_daemons() {
if [ -f /sbin/initctl ]; then if [ -f /sbin/initctl ]; then
echodebug "There's upstart support while checking salt-$fname" echodebug "There's upstart support while checking salt-$fname"
status salt-$fname || echowarn "Upstart does not apparently know anything about salt-$fname"
sleep 1
if [ $? -eq 0 ]; then
echodebug "Upstart apparently knows about salt-$fname"
# 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
# Is it running??? status salt-$fname 2>/dev/null | grep -q running
status salt-$fname | grep -q running if [ $? -eq 0 ]; then
# If it is, stop it stop salt-$fname || (echodebug "Failed to stop salt-$fname" && return 1)
if [ $? -eq 0 ]; then
sleep 1
stop salt-$fname || (echodebug "Failed to stop salt-$fname" && return 1)
fi
# Now start it
sleep 1
start salt-$fname
[ $? -eq 0 ] && continue
# We failed to start the service, let's test the SysV code bellow
echodebug "Failed to start salt-$fname"
fi fi
start salt-$fname
[ $? -eq 0 ] && continue
# We failed to start the service, let's test the SysV code below
echodebug "Failed to start salt-$fname using Upstart"
fi fi
if [ ! -f /etc/init.d/salt-$fname ]; then if [ ! -f /etc/init.d/salt-$fname ]; then