From f34c4698e38afabe5644e3e89e4e375837612549 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Tue, 13 Sep 2016 20:28:28 +0100 Subject: prototypes: bifrost: Check we are running the destroy-env.sh as root Nearly all operations in the destroy-env.sh script need to be executed as root so make sure that's the case before we try to do anything. This also fixes the dnsmasq.leases path and we check that the file exists before we try to wipe it. The dnsmasq is also restarted to take the empty leases file into consideration. Finally, we improve the documentation to run the necessary commands using sudo. Change-Id: I56df821ca8a93307117a94a11abd0867b27d8443 Signed-off-by: Markos Chandras --- bifrost/scripts/destroy-env.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'bifrost/scripts') diff --git a/bifrost/scripts/destroy-env.sh b/bifrost/scripts/destroy-env.sh index f092a658..86d7bc48 100755 --- a/bifrost/scripts/destroy-env.sh +++ b/bifrost/scripts/destroy-env.sh @@ -7,6 +7,13 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## + +# We need to execute everything as root +if [[ $(whoami) != "root" ]]; then + echo "Error: This script must be run as root!" + exit 1 +fi + virsh destroy jumphost.opnfvlocal || true virsh destroy controller00.opnfvlocal || true virsh destroy compute00.opnfvlocal || true @@ -22,7 +29,7 @@ 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;" echo "removing leases" -> /var/lib/dnsmasq/dnsmasq.leases +[[ -e /var/lib/misc/dnsmasq/dnsmasq.leases ]] && > /var/lib/misc/dnsmasq/dnsmasq.leases echo "removing logs" rm -rf /var/log/libvirt/baremetal_logs/*.log @@ -38,6 +45,7 @@ fi rm -rf /var/lib/libvirt/images/*.qcow2 echo "restarting services" +service dnsmasq restart service libvirtd restart service ironic-api restart service ironic-conductor start -- cgit