openstack
/
fuel-main
Code Issues Proposed changes

Merge "check if dnsmasq runs after switching to different bootstrap image"

This commit is contained in:
Jenkins 2015-08-11 16:32:13 +00:00 committed by Gerrit Code Review
parent e9fb789d0f 7f8dc06966
commit af2d875a47
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fuel-bootstrap-image-builder/bin/fuel-bootstrap-image-set
View File

@ -51,6 +51,12 @@ maybe_build_ubuntu_bootstrap ()
fi
}
maybe_restart_dnsmasq () {
if ! dockerctl shell cobbler service dnsmasq status >/dev/null; then
dockerctl shell cobbler service dnsmasq restart
fi
}
verify_bootstrap_flavor () {
local flavor="$1"
if [ -z "$flavor" ]; then
@ -95,6 +101,8 @@ switch_bootstrap () {
fi
write_astute_yaml "$flavor"
run_puppet cobbler "$cobbler_manifest"
# XXX: sometimes dnsmasq stops after cobbler sync
maybe_restart_dnsmasq
run_puppet astute "$astute_manifest"
# XXX: astute puppet manifest should take care to restart astuted on its own
dockerctl shell astute killall -sHUP supervisord