Code Review / demo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: daadab1)
replace openecomp.org with onap.org 79/2479/1
authorMarco Platania <platania@research.att.com>
Tue, 28 Mar 2017 21:45:13 +0000 (17:45 -0400)
committerMarco Platania <platania@research.att.com>
Tue, 28 Mar 2017 21:45:13 +0000 (17:45 -0400)
Change-Id: Ie85c0d66c19821e46581bb8f09294d828ab4aa97
Signed-off-by: Marco Platania <platania@research.att.com>
.gitreview patch | blob | history
boot/appc_vm_init.sh patch | blob | history
heat/OpenECOMP/openecomp_rackspace.env patch | blob | history
heat/OpenECOMP/openecomp_rackspace.yaml patch | blob | history
heat/vFW/base_vfw.env patch | blob | history
heat/vLB/base_vlb.env patch | blob | history
heat/vLB/dnsscaling.env patch | blob | history
heat/vLB/packet_gen_vlb.env patch | blob | history
scripts/deploy.sh patch | blob | history

diff --git a/.gitreview b/.gitreview
index ab3f054..787d1fb 100644 (file)
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,5 @@
 [gerrit]
-host=gerrit.openecomp.org
+#host=gerrit.openecomp.org
+host=gerrit.onap.org
 port=29418
 project=demo.git
diff --git a/boot/appc_vm_init.sh b/boot/appc_vm_init.sh
index 2790782..33177f7 100644 (file)
--- a/boot/appc_vm_init.sh
+++ b/boot/appc_vm_init.sh
@@ -20,5 +20,4 @@ docker tag $NEXUS_DOCKER_REPO/openecomp/appc-image:$DOCKER_IMAGE_VERSION openeco
 docker pull $NEXUS_DOCKER_REPO/openecomp/dgbuilder-sdnc-image:$DOCKER_IMAGE_VERSION
 docker tag $NEXUS_DOCKER_REPO/openecomp/dgbuilder-sdnc-image:$DOCKER_IMAGE_VERSION openecomp/dgbuilder-sdnc-image:latest
 
-#/opt/docker/docker-compose pull
 /opt/docker/docker-compose up -d
diff --git a/heat/OpenECOMP/openecomp_rackspace.env b/heat/OpenECOMP/openecomp_rackspace.env
index bcd30ea..178dfa7 100644 (file)
--- a/heat/OpenECOMP/openecomp_rackspace.env
+++ b/heat/OpenECOMP/openecomp_rackspace.env
@@ -8,9 +8,9 @@ parameters:
 
   pub_key: INSERT YOUR PUBLIC KEY HERE
 
-  nexus_repo: https://nexus.openecomp.org/content/sites/raw
+  nexus_repo: https://nexus.onap.org/content/sites/raw
 
-  nexus_docker_repo: nexus3.openecomp.org:10001
+  nexus_docker_repo: nexus3.onap.org:10001
 
   nexus_username: INSERT YOUR USERNAME HERE
 
@@ -43,9 +43,9 @@ parameters:
 
   openstack_password: INSERT YOUR PASSWORD HERE
 
-  nexus_repo_root: https://nexus.openecomp.org
+  nexus_repo_root: https://nexus.onap.org
 
-  nexus_url_snapshot: https://nexus.openecomp.org/content/repositories/snapshots
+  nexus_url_snapshot: https://nexus.onap.org/content/repositories/snapshots
 
   openstack_region: IAD
 
diff --git a/heat/OpenECOMP/openecomp_rackspace.yaml b/heat/OpenECOMP/openecomp_rackspace.yaml
index 83153be..8a30bbc 100644 (file)
--- a/heat/OpenECOMP/openecomp_rackspace.yaml
+++ b/heat/OpenECOMP/openecomp_rackspace.yaml
@@ -291,7 +291,7 @@ resources:
             echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt
             echo "__gitlab_username__" > /opt/config/gitlab_username.txt
             echo "__gitlab_password__" > /opt/config/gitlab_password.txt
-            echo "gerrit.openecomp.org" > /opt/config/gitlab_certname.txt
+            echo "gerrit.onap.org" > /opt/config/gitlab_certname.txt
             echo "__docker_version__" > /opt/config/docker_version.txt
             
             # Execute docker instructions
@@ -379,7 +379,7 @@ resources:
 
             # Run docker-compose to spin up containers
             cd /opt
-            git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/mso/docker-config.git test_lab
+            git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.onap.org/r/a/mso/docker-config.git test_lab
             MSO_ENCRYPTION_KEY=$(cat /opt/test_lab/encryption.key)
             echo -n "__openstack_api_key__" | openssl aes-128-ecb -e -K $MSO_ENCRYPTION_KEY -nosalt | xxd -c 256 -p > /opt/config/api_key.txt
             ./mso_vm_init.sh
@@ -456,7 +456,7 @@ resources:
 
             # Run docker-compose to spin up containers
             cd /opt
-            git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/dcae/demo/startup/message-router.git dcae-startup-vm-message-router
+            git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.onap.org/r/a/dcae/demo/startup/message-router.git dcae-startup-vm-message-router
             ./mr_vm_init.sh
 
 
@@ -550,7 +550,7 @@ resources:
 
             # Run docker-compose to spin up containers
             cd /opt
-            git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/testsuite/properties.git testsuite/properties
+            git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.onap.org/r/a/testsuite/properties.git testsuite/properties
             ./robot_vm_init.sh
 
 
@@ -627,7 +627,7 @@ resources:
 
             # Run script to spin up containers
             cd /opt
-            git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/vid.git
+            git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.onap.org/r/a/vid.git
             ./vid_vm_init.sh
 
 
@@ -706,7 +706,7 @@ resources:
 
             # Run docker-compose to spin up containers
             cd /opt
-            git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/sdnc/oam.git sdnc
+            git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.onap.org/r/a/sdnc/oam.git sdnc
             ./sdnc_vm_init.sh
 
 
@@ -827,7 +827,7 @@ resources:
             chmod 777 /data/logs/BE
             chmod 777 /data/logs/FE
 
-            git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/sdc.git
+            git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.onap.org/r/a/sdc.git
 
             cat > /root/.bash_aliases << EOF
             alias dcls='/data/scripts/docker_clean.sh \$1'
@@ -925,7 +925,7 @@ resources:
             # Run Portal-specific instructions
             mkdir -p /PROJECT/OpenSource/UbuntuEP/logs
             cd /opt
-            git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/portal.git
+            git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.onap.org/r/a/portal.git
 
             # Run docker-compose to spin up containers
             ./portal_vm_init.sh
@@ -1006,7 +1006,7 @@ resources:
             
             # DCAE Controller specific deployment
             cd /opt
-            git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/dcae/demo/startup/controller.git dcae-startup-vm-controller
+            git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.onap.org/r/a/dcae/demo/startup/controller.git dcae-startup-vm-controller
 
             cd dcae-startup-vm-controller
             mkdir -p /opt/app/dcae-controller
@@ -1033,7 +1033,7 @@ resources:
             
             DOCKER-REGISTRY: __nexus_docker_repo__
 
-            GIT-MR-REPO: https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/dcae/demo/startup/message-router.git
+            GIT-MR-REPO: https://__gitlab_username__:__gitlab_password__@gerrit.onap.org/r/a/dcae/demo/startup/message-router.git
             EOF_CONFIG
 
             # Store credentials in files
@@ -1134,7 +1134,7 @@ resources:
 
             # Run docker-compose to spin up containers
             cd /opt
-            git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/policy/docker.git policy
+            git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.onap.org/r/a/policy/docker.git policy
 
             ./policy_vm_init.sh
 
@@ -1216,6 +1216,6 @@ resources:
 
             # Run docker-compose to spin up containers
             cd /opt
-            git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/appc/deployment.git appc
+            git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.onap.org/r/a/appc/deployment.git appc
             ./appc_vm_init.sh
 
diff --git a/heat/vFW/base_vfw.env b/heat/vFW/base_vfw.env
index 6f447fe..cadd18f 100644 (file)
--- a/heat/vFW/base_vfw.env
+++ b/heat/vFW/base_vfw.env
@@ -23,8 +23,8 @@ parameters:
   vf_module_id: vFirewall
   dcae_collector_ip: 10.0.4.102
   dcae_collector_port: 8080
-  repo_url_blob: https://nexus.openecomp.org/content/repositories/raw
-  repo_url_artifacts: https://nexus.openecomp.org/content/groups/staging
+  repo_url_blob: https://nexus.onap.org/content/repositories/raw
+  repo_url_artifacts: https://nexus.onap.org/content/groups/staging
   demo_artifacts_version: 1.0.0
   key_name: vfw_key
   pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
diff --git a/heat/vLB/base_vlb.env b/heat/vLB/base_vlb.env
index 6a822b1..c07e7e4 100644 (file)
--- a/heat/vLB/base_vlb.env
+++ b/heat/vLB/base_vlb.env
@@ -17,8 +17,8 @@ parameters:
   vf_module_id: vLoadBalancer
   dcae_collector_ip: 10.0.4.102
   dcae_collector_port: 8080
-  repo_url_blob: https://nexus.openecomp.org/content/repositories/raw
-  repo_url_artifacts: https://nexus.openecomp.org/content/groups/staging
+  repo_url_blob: https://nexus.onap.org/content/repositories/raw
+  repo_url_artifacts: https://nexus.onap.org/content/groups/staging
   demo_artifacts_version: 1.0.0
   key_name: vlb_key
   pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
diff --git a/heat/vLB/dnsscaling.env b/heat/vLB/dnsscaling.env
index 2b014b3..489b3a7 100644 (file)
--- a/heat/vLB/dnsscaling.env
+++ b/heat/vLB/dnsscaling.env
@@ -12,8 +12,8 @@ parameters:
   vdns_name_0: zdfw1lb01dns02
   vnf_id: vLoadBalancer_demo_app
   vf_module_id: vLoadBalancer
-  repo_url_blob: https://nexus.openecomp.org/content/repositories/raw
-  repo_url_artifacts: https://nexus.openecomp.org/content/groups/staging
+  repo_url_blob: https://nexus.onap.org/content/repositories/raw
+  repo_url_artifacts: https://nexus.onap.org/content/groups/staging
   demo_artifacts_version: 1.0.0
   key_name: vlb_key_scaling
   pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
diff --git a/heat/vLB/packet_gen_vlb.env b/heat/vLB/packet_gen_vlb.env
index e88a383..6b53076 100644 (file)
--- a/heat/vLB/packet_gen_vlb.env
+++ b/heat/vLB/packet_gen_vlb.env
@@ -4,8 +4,8 @@ parameters:
   public_net_id: 00000000-0000-0000-0000-000000000000
   vlb_ipaddr: INSERT THE PUBLIC ADDRESS OF THE vLB HERE
   vpg_name_0: ziad1vdnspg01pg01
-  repo_url_blob: https://nexus.openecomp.org/content/repositories/raw
-  repo_url_artifacts: https://nexus.openecomp.org/content/groups/staging
+  repo_url_blob: https://nexus.onap.org/content/repositories/raw
+  repo_url_artifacts: https://nexus.onap.org/content/groups/staging
   demo_artifacts_version: 1.0.0
   key_name: pgforvdnsdemo_key
   pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index 2ba5ea6..3b9f449 100755 (executable)
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -32,11 +32,11 @@ HEAT_VLB_GROUP_ID=$PARENT_GROUP_ID"/heat/vLB"
 VFW_GROUP_ID=$PARENT_GROUP_ID"/vnfs/vfw"
 VLB_GROUP_ID=$PARENT_GROUP_ID"/vnfs/vlb"
 
-REPO_URL="https://nexus.openecomp.org/content/sites/raw"
+REPO_URL="https://nexus.onap.org/content/sites/raw"
 USER=$(xpath -q -e "//servers/server[id='ecomp-raw']/username/text()" "$SETTINGS_FILE")
 PASS=$(xpath -q -e "//servers/server[id='ecomp-raw']/password/text()" "$SETTINGS_FILE")
 NETRC=$(mktemp)
-echo "machine nexus.openecomp.org login ${USER} password ${PASS}" > "${NETRC}"
+echo "machine nexus.onap.org login ${USER} password ${PASS}" > "${NETRC}"
 #######################################
 
 ##### Upload scripts into Nexus raw repository #####
Demo applications and templates for ONAP platform instantiation.