# Copyright (C) 2018 Ericsson. All rights reserved.
#
# Modifications 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.
# Adding this waiting container due to race condition between pap and mariadb
docker-compose -f ${WORKSPACE}/scripts/policy/policy-apex-pdp/docker-compose-apex.yml run --rm start_dependencies
-docker-compose -f ${WORKSPACE}/scripts/policy/policy-apex-pdp/docker-compose-apex.yml up -d
+
+#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/policy-apex-pdp/docker-compose-apex.yml run --rm start_all
+
+unset http_proxy https_proxy
POLICY_API_IP=`get-instance-ip.sh policy-api`
POLICY_PAP_IP=`get-instance-ip.sh policy-pap`
echo APEX IP IS ${APEX_IP}
echo DMAAP_IP IS ${DMAAP_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 ${APEX_IP}:6969 && break
- echo sleep $i
- sleep $i
-done
-for i in {1..10}; do
- curl -sS ${DMAAP_IP}:3904 && 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
-
ROBOT_VARIABLES="-v APEX_IP:${APEX_IP} -v POLICY_API_IP:${POLICY_API_IP} -v POLICY_PAP_IP:${POLICY_PAP_IP}"
# Adding this waiting container to avoid race condition between api and mariadb containers.
docker-compose -f ${WORKSPACE}/scripts/policy/docker-compose-api.yml run --rm start_dependencies
-docker-compose -f ${WORKSPACE}/scripts/policy/docker-compose-api.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-api.yml run --rm start_all
+
+unset http_proxy https_proxy
POLICY_API_IP=`get-instance-ip.sh policy-api`
MARIADB_IP=`get-instance-ip.sh mariadb`
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_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
-
ROBOT_VARIABLES="-v POLICY_API_IP:${POLICY_API_IP}"
kill-instance.sh policy-api
kill-instance.sh mariadb
-kill-instance.sh policy-wait
#!/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.
# 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`
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"
#!/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.
kill-instance.sh policy-pap
kill-instance.sh policy-api
kill-instance.sh mariadb
-kill-instance.sh policy-wait
# Adding this waiting container due to race condition between pap and mariadb
docker-compose -f ${WORKSPACE}/scripts/policy/policy-xacml-pdp/docker-compose-pdpx.yml run --rm start_dependencies
-docker-compose -f ${WORKSPACE}/scripts/policy/policy-xacml-pdp/docker-compose-pdpx.yml up -d
+
+#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/policy-xacml-pdp/docker-compose-pdpx.yml run --rm start_all
unset http_proxy https_proxy
echo MARIADB IP IS ${MARIADB_IP}
echo DMAAP_IP IS ${DMAAP_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_PDPX_IP}:6969 && break
- echo sleep $i
- sleep $i
-done
-for i in {1..10}; do
- curl -sS ${DMAAP_IP}:3904 && 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
-
ROBOT_VARIABLES="-v POLICY_PDPX_IP:${POLICY_PDPX_IP} -v POLICY_API_IP:${POLICY_API_IP} -v POLICY_PAP_IP:${POLICY_PAP_IP}"
- "6969:6969"
start_dependencies:
image: dadarek/wait-for-dependencies
+ environment:
+ TIMEOUT_LENGTH: 60
container_name: policy-wait
depends_on:
- mariadb
hostname: policy-wait
command: mariadb:3306
+ start_all:
+ image: dadarek/wait-for-dependencies
+ environment:
+ TIMEOUT_LENGTH: 60
+ container_name: policy-wait-all
+ depends_on:
+ - mariadb
+ - api
+ hostname: policy-wait-all
+ command:
+ mariadb:3306
+ api:6969
ports:
- "3306:3306"
pap:
- image: nexus3.onap.org:10001/onap/policy-pap:2.0.0-SNAPSHOT-latest
+ image: nexus3.onap.org:10001/onap/policy-pap
container_name: policy-pap
depends_on:
- - "mariadb"
+ - mariadb
hostname: policy-pap
ports:
- "6969:6969"
- "9969:6969"
start_dependencies:
image: dadarek/wait-for-dependencies
+ environment:
+ TIMEOUT_LENGTH: 60
container_name: policy-wait
depends_on:
- mariadb
hostname: policy-wait
command: mariadb:3306
+ start_all:
+ image: dadarek/wait-for-dependencies
+ environment:
+ TIMEOUT_LENGTH: 60
+ container_name: policy-wait-all
+ depends_on:
+ - mariadb
+ - pap
+ - api
+ hostname: policy-wait-all
+ command:
+ mariadb:3306
+ pap:6969
+ api:6969
# 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.
ports:
- "3904:3904"
pap:
- image: nexus3.onap.org:10001/onap/policy-pap:2.0.0-SNAPSHOT-latest
+ image: nexus3.onap.org:10001/onap/policy-pap
container_name: policy-pap
depends_on:
- mariadb
- mariadb
hostname: policy-api
apex:
- image: nexus3.onap.org:10001/onap/policy-apex-pdp:2.1-SNAPSHOT-latest
+ image: nexus3.onap.org:10001/onap/policy-apex-pdp
container_name: policy-apex-pdp
depends_on:
- mariadb
- dmaap
- pap
- - api
hostname: policy-apex-pdp
command: ['/opt/app/policy/apex-pdp/bin/apexOnapPf.sh', '-c', '/opt/app/policy/apex-pdp/etc/onappf/config/OnapPfConfig.json', '-p', '/opt/app/policy/apex-pdp/etc/onappf/config/topic.properties']
volumes:
- "23324:23324"
start_dependencies:
image: dadarek/wait-for-dependencies
+ environment:
+ TIMEOUT_LENGTH: 60
container_name: policy-wait
depends_on:
- mariadb
- dmaap
hostname: policy-wait
command:
- - mariadb:3306
- - dmaap:3904
+ mariadb:3306
+ dmaap:3904
+ start_all:
+ image: dadarek/wait-for-dependencies
+ environment:
+ TIMEOUT_LENGTH: 60
+ container_name: policy-wait-all
+ depends_on:
+ - mariadb
+ - dmaap
+ - api
+ - pap
+ - apex
+ hostname: policy-wait-all
+ command:
+ mariadb:3306
+ dmaap:3904
+ api:6969
+ pap:6969
+ apex:6969
ports:
- "3904:3904"
pap:
- image: nexus3.onap.org:10001/onap/policy-pap:2.0.0-SNAPSHOT-latest
+ image: nexus3.onap.org:10001/onap/policy-pap
container_name: policy-pap
depends_on:
- mariadb
- mariadb
hostname: policy-api
xacml-pdp:
- image: nexus3.onap.org:10001/onap/policy-xacml-pdp:2.0.0-SNAPSHOT-latest
+ image: nexus3.onap.org:10001/onap/policy-xacml-pdp
container_name: policy-xacml-pdp
depends_on:
- mariadb
- message-router
- pap
- - api
hostname: policy-xacml-pdp
ports:
- "6969:6969"
start_dependencies:
image: dadarek/wait-for-dependencies
+ environment:
+ TIMEOUT_LENGTH: 60
container_name: policy-wait
depends_on:
- mariadb
- message-router
hostname: policy-wait
command:
- - mariadb:3306
- - message-router:3904
+ mariadb:3306
+ message-router:3904
+ start_all:
+ image: dadarek/wait-for-dependencies
+ environment:
+ TIMEOUT_LENGTH: 60
+ container_name: policy-wait-all
+ depends_on:
+ - mariadb
+ - message-router
+ - api
+ - pap
+ - xacml-pdp
+ hostname: policy-wait-all
+ command:
+ mariadb:3306
+ message-router:3904
+ api:6969
+ pap:6969
+ xacml-pdp:6969