aboutsummaryrefslogtreecommitdiffstats
path: root/plans/policy/pap
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2019-06-03 15:00:08 -0400
committerJim Hahn <jrh3@att.com>2019-06-05 09:23:36 -0400
commit954af9374e4cffb7f0d0bfba0443ca1b12ec90bc (patch)
treec48ddedbce1b0d37834dc18d86e4d8576ffb980f /plans/policy/pap
parentfbcd0e2ef7049e3bc03464509b868fb48a9f7da9 (diff)
Run DB script before starting other containers
The other containers were starting before their user names had been added to the DB. Consequently, they were aborting at start-up. Modified the various setup.sh scripts to run the DB-init script before starting the remaing containers. Also add start_all to start the containers and wait for the ports to start listening, eliminating the need for the "curl" tests in the setup.sh scripts. Also removed version numbers from some yml files. Change-Id: Idd9ff81b3ab4a78926b644f22360c9222afe82d5 Issue-ID: POLICY-1829 Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'plans/policy/pap')
-rw-r--r--plans/policy/pap/setup.sh31
-rw-r--r--plans/policy/pap/teardown.sh2
2 files changed, 10 insertions, 23 deletions
diff --git a/plans/policy/pap/setup.sh b/plans/policy/pap/setup.sh
index d1ba20c2..8bd3f0ac 100644
--- a/plans/policy/pap/setup.sh
+++ b/plans/policy/pap/setup.sh
@@ -1,6 +1,7 @@
#!/bin/bash
# ============LICENSE_START=======================================================
# Copyright (C) 2019 Nordix Foundation.
+# Modifications Copyright (C) 2019 AT&T Intellectual Property.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -24,11 +25,17 @@ pip install -U docker==2.7.0
# Adding this waiting container due to race condition between pap and mariadb
docker-compose -f ${WORKSPACE}/scripts/policy/docker-compose-pap.yml run --rm start_dependencies
-docker-compose -f ${WORKSPACE}/scripts/policy/docker-compose-pap.yml up -d
-sleep 3
+
+#Configure the database
+docker exec -it mariadb chmod +x /docker-entrypoint-initdb.d/db.sh
+docker exec -it mariadb /docker-entrypoint-initdb.d/db.sh
+
+# now bring everything else up
+docker-compose -f ${WORKSPACE}/scripts/policy/docker-compose-pap.yml run --rm start_all
unset http_proxy https_proxy
+
POLICY_PAP_IP=`get-instance-ip.sh policy-pap`
POLICY_API_IP=`get-instance-ip.sh policy-api`
MARIADB_IP=`get-instance-ip.sh mariadb`
@@ -36,26 +43,6 @@ MARIADB_IP=`get-instance-ip.sh mariadb`
echo PAP IP IS ${POLICY_PAP_IP}
echo API IP IS ${POLICY_API_IP}
echo MARIADB IP IS ${MARIADB_IP}
-# Wait for initialization
-for i in {1..10}; do
- curl -sS ${MARIADB_IP}:3306 && break
- echo sleep $i
- sleep $i
-done
-for i in {1..10}; do
- curl -sS ${POLICY_PAP_IP}:6969 && break
- echo sleep $i
- sleep $i
-done
-for i in {1..10}; do
- curl -sS ${POLICY_API_IP}:6969 && break
- echo sleep $i
- sleep $i
-done
-
-#Configure the database
-docker exec -it mariadb chmod +x /docker-entrypoint-initdb.d/db.sh
-docker exec -it mariadb /docker-entrypoint-initdb.d/db.sh
#Add policy type and policy to the database via the Policy Api
AUTH="healthcheck:zb!XztG34"
diff --git a/plans/policy/pap/teardown.sh b/plans/policy/pap/teardown.sh
index f05d3af9..c2d7e214 100644
--- a/plans/policy/pap/teardown.sh
+++ b/plans/policy/pap/teardown.sh
@@ -1,6 +1,7 @@
#!/bin/bash
# ============LICENSE_START=======================================================
# Copyright (C) 2019 Nordix Foundation.
+# Modifications Copyright (C) 2019 AT&T Intellectual Property.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -20,4 +21,3 @@
kill-instance.sh policy-pap
kill-instance.sh policy-api
kill-instance.sh mariadb
-kill-instance.sh policy-wait