Use onap instead of openecomp for docker tag

Issue-ID: AAI-479
Change-Id: Id4c722bf680e739b2820e0751366276a7516aa24
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>

diff --git a/deploy_vm1.sh b/deploy_vm1.sh
index 8de109b..d9d4b32 100755 (executable)
--- a/deploy_vm1.sh
+++ b/deploy_vm1.sh
@@ -103,11 +103,11 @@ function check_if_user_exists(){
         }
 }
 
-docker pull ${DOCKER_REGISTRY}/openecomp/aai-resources:${DOCKER_IMAGE_VERSION};
-docker tag $DOCKER_REGISTRY/openecomp/aai-resources:$DOCKER_IMAGE_VERSION $DOCKER_REGISTRY/openecomp/aai-resources:latest;
+docker pull ${DOCKER_REGISTRY}/onap/aai-resources:${DOCKER_IMAGE_VERSION};
+docker tag $DOCKER_REGISTRY/onap/aai-resources:$DOCKER_IMAGE_VERSION $DOCKER_REGISTRY/onap/aai-resources:latest;
 
-docker pull ${DOCKER_REGISTRY}/openecomp/aai-traversal:${DOCKER_IMAGE_VERSION};
-docker tag $DOCKER_REGISTRY/openecomp/aai-traversal:$DOCKER_IMAGE_VERSION $DOCKER_REGISTRY/openecomp/aai-traversal:latest;
+docker pull ${DOCKER_REGISTRY}/onap/aai-traversal:${DOCKER_IMAGE_VERSION};
+docker tag $DOCKER_REGISTRY/onap/aai-traversal:$DOCKER_IMAGE_VERSION $DOCKER_REGISTRY/onap/aai-traversal:latest;
 
 docker pull ${DOCKER_REGISTRY}/onap/search-data-service:${DOCKER_IMAGE_VERSION};
 docker tag $DOCKER_REGISTRY/onap/search-data-service:$DOCKER_IMAGE_VERSION $DOCKER_REGISTRY/onap/search-data-service:latest;
@@ -136,14 +136,14 @@ fi;
 
 chown -R $USER_ID:$USER_ID $RESOURCE_LOGS $TRAVERSAL_LOGS;
 
-RESOURCES_CONTAINER_NAME=$($DOCKER_COMPOSE_CMD up -d aai-resources.api.simpledemo.openecomp.org 2>&1 | grep 'Creating' | grep -v 'volume' | grep -v 'network' | awk '{ print $2; }' | head -1);
+RESOURCES_CONTAINER_NAME=$($DOCKER_COMPOSE_CMD up -d aai-resources.api.simpledemo.onap.org 2>&1 | grep 'Creating' | grep -v 'volume' | grep -v 'network' | awk '{ print $2; }' | head -1);
 wait_for_container $RESOURCES_CONTAINER_NAME '0.0.0.0:8447';
 
-GRAPH_CONTAINER_NAME=$($DOCKER_COMPOSE_CMD up -d aai-traversal.api.simpledemo.openecomp.org 2>&1 | grep 'Creating' | awk '{ print $2; }' | head -1);
+GRAPH_CONTAINER_NAME=$($DOCKER_COMPOSE_CMD up -d aai-traversal.api.simpledemo.onap.org 2>&1 | grep 'Creating' | awk '{ print $2; }' | head -1);
 wait_for_container $GRAPH_CONTAINER_NAME '0.0.0.0:8446';
 
 # Deploy haproxy and traversal and resources
-$DOCKER_COMPOSE_CMD up -d aai.api.simpledemo.openecomp.org
+$DOCKER_COMPOSE_CMD up -d aai.api.simpledemo.onap.org
 
 $DOCKER_COMPOSE_CMD up -d sparky-be
 

diff --git a/deploy_vm2.sh b/deploy_vm2.sh
index 3589e1c..5ef9068 100755 (executable)
--- a/deploy_vm2.sh
+++ b/deploy_vm2.sh
@@ -40,7 +40,7 @@ docker pull ${HBASE_IMAGE}:${HBASE_VERSION};
 $DOCKER_COMPOSE_CMD stop
 $DOCKER_COMPOSE_CMD rm -f -v
 
-HBASE_CONTAINER_NAME=$($DOCKER_COMPOSE_CMD up -d aai.hbase.simpledemo.openecomp.org 2>&1 | grep 'Creating' | grep -v 'volume' | grep -v 'network' | awk '{ print $2; }' | head -1);
+HBASE_CONTAINER_NAME=$($DOCKER_COMPOSE_CMD up -d aai.hbase.simpledemo.onap.org 2>&1 | grep 'Creating' | grep -v 'volume' | grep -v 'network' | awk '{ print $2; }' | head -1);
 wait_for_container $HBASE_CONTAINER_NAME ' Started SelectChannelConnector@0.0.0.0:8085';
 wait_for_container $HBASE_CONTAINER_NAME ' Started SelectChannelConnector@0.0.0.0:8080';
 wait_for_container $HBASE_CONTAINER_NAME ' Started SelectChannelConnector@0.0.0.0:9095';

diff --git a/docker-compose-app.yml b/docker-compose-app.yml
index 778d727..6a6ccff 100644 (file)
--- a/docker-compose-app.yml
+++ b/docker-compose-app.yml
@@ -1,8 +1,8 @@
 version: '2'
 services:
-  aai-resources.api.simpledemo.openecomp.org:
-    image: ${DOCKER_REGISTRY}/openecomp/aai-resources
-    hostname: aai-resources.api.simpledemo.openecomp.org
+  aai-resources.api.simpledemo.onap.org:
+    image: ${DOCKER_REGISTRY}/onap/aai-resources
+    hostname: aai-resources.api.simpledemo.onap.org
     environment:
       - AAI_CHEF_ENV=simpledemo
       - AAI_CHEF_LOC=/var/chef/aai-data/environments
@@ -19,9 +19,9 @@ services:
       options:
         max-size: "30m"
         max-file: "5"
-  aai-traversal.api.simpledemo.openecomp.org:
-    image: ${DOCKER_REGISTRY}/openecomp/aai-traversal
-    hostname: aai-traversal.api.simpledemo.openecomp.org
+  aai-traversal.api.simpledemo.onap.org:
+    image: ${DOCKER_REGISTRY}/onap/aai-traversal
+    hostname: aai-traversal.api.simpledemo.onap.org
     environment:
       - AAI_CHEF_ENV=simpledemo
       - AAI_CHEF_LOC=/var/chef/aai-data/environments
@@ -38,14 +38,14 @@ services:
       options:
         max-size: "30m"
         max-file: "5"
-  aai.api.simpledemo.openecomp.org:
+  aai.api.simpledemo.onap.org:
     image: ${AAI_HAPROXY_IMAGE}:${AAI_HAPROXY_VERSION}
-    hostname: aai.api.simpledemo.openecomp.org
+    hostname: aai.api.simpledemo.onap.org
     ports:
       - 8443:8443
     links:
-      - aai-resources.api.simpledemo.openecomp.org
-      - aai-traversal.api.simpledemo.openecomp.org
+      - aai-resources.api.simpledemo.onap.org
+      - aai-traversal.api.simpledemo.onap.org
     volumes:
       - /dev/log:/dev/log
     logging:

diff --git a/docker-compose-db.yml b/docker-compose-db.yml
index c66d651..3f93f48 100644 (file)
--- a/docker-compose-db.yml
+++ b/docker-compose-db.yml
@@ -1,8 +1,8 @@
 version: '2'
 services:
-  aai.hbase.simpledemo.openecomp.org:
+  aai.hbase.simpledemo.onap.org:
     image: ${HBASE_IMAGE}:${HBASE_VERSION}
-    hostname: aai.hbase.simpledemo.openecomp.org
+    hostname: aai.hbase.simpledemo.onap.org
     ports:
       - 2181:2181
       - 8080:8080