summaryrefslogtreecommitdiffstats
path: root/prototypes
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2016-10-20 14:18:27 +0100
committerMarkos Chandras <mchandras@suse.de>2016-10-20 14:49:37 +0100
commit5d9db0d4e3bf2ac3994cbf59168ece664d5bd49c (patch)
tree6f1d7d308466e913d2d5118d194686c8633ecc8b /prototypes
parenta26858a97ee50374b406cdbaadad1284ae4b6185 (diff)
prototypes: bifrost: Ignore dnsmasq service failures
If this is the first time we run bifrost on a host or if we haven't run bifrost since the last reboot, restarting the dnsmasq service will fail because of conflicts with the dnsmasq process running by libvirt. This is later on 'fixed' by bifrost by killing the one from libvirt. Make sure that this spurious failure will not prevent the rest of the cleanup process to move on. Change-Id: Iebf37881570c27cb07cea3cecdb0fa8ac3fc511b Signed-off-by: Markos Chandras <mchandras@suse.de>
Diffstat (limited to 'prototypes')
-rwxr-xr-xprototypes/bifrost/scripts/destroy-env.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/prototypes/bifrost/scripts/destroy-env.sh b/prototypes/bifrost/scripts/destroy-env.sh
index 674645777..cdc55df1b 100755
--- a/prototypes/bifrost/scripts/destroy-env.sh
+++ b/prototypes/bifrost/scripts/destroy-env.sh
@@ -46,7 +46,7 @@ fi
rm -rf /var/lib/libvirt/images/*.qcow2
echo "restarting services"
-service dnsmasq restart
+service dnsmasq restart || true
service libvirtd restart
service ironic-api restart
service ironic-conductor start