summaryrefslogtreecommitdiffstats
path: root/bifrost/scripts
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2016-10-20 14:18:27 +0100
committerTrevor Bramwell <tbramwell@linuxfoundation.org>2017-08-11 12:56:12 -0700
commit08348ff3dbb7214a4b2209b98181442653a6681c (patch)
tree72cfd85442d0b715e1fdb9659880147b085213c2 /bifrost/scripts
parenta5099b031e5eb52ea7b04659e619b47da80103bf (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 'bifrost/scripts')
-rwxr-xr-xbifrost/scripts/destroy-env.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/bifrost/scripts/destroy-env.sh b/bifrost/scripts/destroy-env.sh
index 67464577..cdc55df1 100755
--- a/bifrost/scripts/destroy-env.sh
+++ b/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