diff --git a/clmctest/conts-create.sh b/clmctest/conts-create.sh index bfe4a5ac0912ceaddf9aa17eb65671db56c0ae22..58db1511dfafa6918a04d76c4b8da43323912aa8 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 82cc1431068093371995dd94cd1f69fd3da82981..ca1ce0abac4a46143b91e177b3144b3b00ac7afa 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