From d768cc2aa9f4aa587b21e30bddb5dc53a6fb0e5e Mon Sep 17 00:00:00 2001
From: Stephen C Phillips <steve@scphillips.com>
Date: Fri, 25 May 2018 17:31:11 +0100
Subject: [PATCH] Correctly gets IP in destroy; adds more sleep in create
---
clmctest/conts-create.sh | 6 +-----
clmctest/conts-destroy.sh | 5 +++--
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/clmctest/conts-create.sh b/clmctest/conts-create.sh
index bfe4a5a..58db151 100755
--- a/clmctest/conts-create.sh
+++ b/clmctest/conts-create.sh
@@ -25,7 +25,7 @@ for service_name in $service_names; do
# start the container
lxc-start -n ${service_name}
- sleep 4
+ sleep 10
echo "Provisioning: ${service_name}"
if [ ${service_name} == "clmc-service" ]
@@ -47,10 +47,6 @@ for service_name in $service_names; do
influxdb_url=$(echo $SERVICE | jq -r '.influxdb_url')
database_name=$(echo $SERVICE | jq -r '.database_name')
- echo "*********************"
- echo $location
- echo $sf_id
-
cmd=/vagrant/clmctest/services/${sf_id}/install.sh
lxc-attach -n ${service_name} -v REPO_ROOT=/vagrant -- ${cmd}
diff --git a/clmctest/conts-destroy.sh b/clmctest/conts-destroy.sh
index 82cc143..ca1ce0a 100755
--- a/clmctest/conts-destroy.sh
+++ b/clmctest/conts-destroy.sh
@@ -9,7 +9,8 @@ for service_name in $service_names; do
lxc-stop -n ${service_name}
echo "Destroying container: ${service_name}"
lxc-destroy -n ${service_name}
- ip=$(jq -r --arg NAME ${service_name} '.[] | select(.name==$NAME | .ip_address')
- sed -i '/${ip}/d' /etc/lxc/dnsmasq.conf
+ ip=$(jq -r --arg NAME ${service_name} '.[] | select(.name==$NAME) | .ip_address' ${rspec_file})
+ #TODO: this line doesn't work for some reason and it's also dangerous because an IP could match more than 1 line in the file
+ #sed -i '/${ip}/d' /etc/lxc/dnsmasq.conf
fi
done
--
GitLab