From 482e69470df85abb82649873dc37cba13284884c Mon Sep 17 00:00:00 2001 From: Markos Chandras <mchandras@suse.de> Date: Fri, 27 Jan 2017 15:17:54 +0000 Subject: [PATCH] jjb: infra: prototypes: bifrost: Ignore mysql and ironic failures On brand new hosts ironic may not be installed yet so attemping to restart ironic services will lead to failures. Similarly, mysql may also not be installed so do not try to wipe the tables. Change-Id: Ic77d9358aeecb11f5c076a47cfea18ee4f0dff9f Signed-off-by: Markos Chandras <mchandras@suse.de> --- bifrost/scripts/destroy-env.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/bifrost/scripts/destroy-env.sh b/bifrost/scripts/destroy-env.sh index cdc55df1..9920046e 100755 --- a/bifrost/scripts/destroy-env.sh +++ b/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 -- 2.16.6