summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2017-02-01 11:36:50 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-02-01 11:36:50 +0000
commitf278f55343b28bcb32640e9b0fcd2dd468a7bb86 (patch)
treecb22cb97716519c7daec21120f64829ed1e748c2
parenta31fea270f18f6eac7f476c5b893dec85f872912 (diff)
parent52373b74b3378f5c21bff219b2b19e76bfe9241a (diff)
Merge "jjb: infra: prototypes: bifrost: Ignore mysql and ironic failures"
-rwxr-xr-xprototypes/bifrost/scripts/destroy-env.sh18
1 files changed, 10 insertions, 8 deletions
diff --git a/prototypes/bifrost/scripts/destroy-env.sh b/prototypes/bifrost/scripts/destroy-env.sh
index cdc55df1b..9920046e1 100755
--- a/prototypes/bifrost/scripts/destroy-env.sh
+++ b/prototypes/bifrost/scripts/destroy-env.sh
@@ -21,13 +21,15 @@ virsh undefine jumphost.opnfvlocal || true
virsh undefine controller00.opnfvlocal || true
virsh undefine compute00.opnfvlocal || true
-service ironic-conductor stop
+service ironic-conductor stop || true
echo "removing from database"
-mysql -u root ironic --execute "truncate table ports;"
-mysql -u root ironic --execute "delete from node_tags;"
-mysql -u root ironic --execute "delete from nodes;"
-mysql -u root ironic --execute "delete from conductors;"
+if $(which mysql &> /dev/null); then
+ mysql -u root ironic --execute "truncate table ports;"
+ mysql -u root ironic --execute "delete from node_tags;"
+ mysql -u root ironic --execute "delete from nodes;"
+ mysql -u root ironic --execute "delete from conductors;"
+fi
echo "removing leases"
[[ -e /var/lib/misc/dnsmasq/dnsmasq.leases ]] && > /var/lib/misc/dnsmasq/dnsmasq.leases
echo "removing logs"
@@ -48,6 +50,6 @@ rm -rf /var/lib/libvirt/images/*.qcow2
echo "restarting services"
service dnsmasq restart || true
service libvirtd restart
-service ironic-api restart
-service ironic-conductor start
-service ironic-inspector restart
+service ironic-api restart || true
+service ironic-conductor start || true
+service ironic-inspector restart || true