diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2019-04-04 00:49:56 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-04-04 00:49:56 +0000 |
| commit | 4014d3737c08862eb3054f42c05cb994c30837ed (patch) | |
| tree | 311076d86e7629628c2c1b4762ec77fc14fb4a71 | |
| parent | 72b16a165989b1ec3706071464f0f17af5df9122 (diff) | |
| parent | 4cb0ffb3b9fb22b0b3773d9663908c3cbf0ed568 (diff) | |
Merge "fix for proxy setup"
| -rwxr-xr-x | scripts/dmaap-buscontroller/dmaapbc-launch.sh | 3 | ||||
| -rwxr-xr-x | scripts/dmaap-buscontroller/start-mock.sh | 3 | ||||
| -rwxr-xr-x | scripts/dmaap-message-router/dmaap-mr-launch.sh | 5 |
3 files changed, 11 insertions, 0 deletions
diff --git a/scripts/dmaap-buscontroller/dmaapbc-launch.sh b/scripts/dmaap-buscontroller/dmaapbc-launch.sh index 079b6644..0a653fa1 100755 --- a/scripts/dmaap-buscontroller/dmaapbc-launch.sh +++ b/scripts/dmaap-buscontroller/dmaapbc-launch.sh @@ -24,6 +24,9 @@ function dmaapbc_launch() { docker run -d $ADDHOSTS --name $CONTAINER_NAME -v $TMP_CFG:/opt/app/config/conf $TAG IP=`get-instance-ip.sh ${CONTAINER_NAME}` + source ${SCRIPTS}/common_functions.sh + bypass_ip_adress ${IP} + # Wait for initialization for i in {1..10}; do curl -sS ${IP}:8080 && break diff --git a/scripts/dmaap-buscontroller/start-mock.sh b/scripts/dmaap-buscontroller/start-mock.sh index d50125a4..cd986061 100755 --- a/scripts/dmaap-buscontroller/start-mock.sh +++ b/scripts/dmaap-buscontroller/start-mock.sh @@ -31,6 +31,9 @@ function start_mock() { docker run --name ${app}-mock -d jamesdbloom/mockserver /opt/mockserver/run_mockserver.sh -logLevel INFO -serverPort ${port} -proxyPort 1090 IP=`get-instance-ip.sh ${app}-mock` + source ${SCRIPTS}/common_functions.sh + bypass_ip_adress ${IP} + # Wait for initialization for i in {1..10}; do curl -sS ${IP}:${port} && break diff --git a/scripts/dmaap-message-router/dmaap-mr-launch.sh b/scripts/dmaap-message-router/dmaap-mr-launch.sh index e7ea9a97..4fef6821 100755 --- a/scripts/dmaap-message-router/dmaap-mr-launch.sh +++ b/scripts/dmaap-message-router/dmaap-mr-launch.sh @@ -116,6 +116,11 @@ function dmaap_mr_launch() { echo KAFKA_IP=${KAFKA_IP} echo ZOOKEEPER_IP=${ZOOKEEPER_IP} + source ${SCRIPTS}/common_functions.sh + bypass_ip_adress ${DMAAP_MR_IP} + bypass_ip_adress ${KAFKA_IP} + bypass_ip_adress ${ZOOKEEPER_IP} + # Wait for initialization of docker services for i in {1..50}; do curl -sS -m 1 ${DMAAP_MR_IP}:3904/events/TestTopic && break |