Code Review / demo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: d898508)
Point install/init scripts to released aritfacts 43/51043/1
authorMarco Platania <platania@research.att.com>
Fri, 8 Jun 2018 13:28:50 +0000 (09:28 -0400)
committerMarco Platania <platania@research.att.com>
Fri, 8 Jun 2018 13:28:50 +0000 (09:28 -0400)
Change-Id: Ib13ea785ff19ff2e16ef7ce4debf6bafb8340c42
Issue-ID: UCA-37
Signed-off-by: Marco Platania <platania@research.att.com>
15 files changed:
heat/vCPE/infra/base_vcpe_infra.env patch | blob | history
heat/vCPE/vbng/base_vcpe_vbng.env patch | blob | history
heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env patch | blob | history
heat/vCPE/vgmux/base_vcpe_vgmux.env patch | blob | history
heat/vCPE/vgw/base_vcpe_vgw.env patch | blob | history
heat/vFW/base_vfw.env patch | blob | history
heat/vFWCL/vFWSNK/base_vfw.env patch | blob | history
heat/vFWCL/vPKG/base_vpkg.env patch | blob | history
heat/vLB/base_vlb.env patch | blob | history
heat/vLB/dnsscaling.env patch | blob | history
heat/vLBMS/base_vlb.env patch | blob | history
heat/vLBMS/dnsscaling.env patch | blob | history
vnfs/vLBMS/scripts/v_dns_install.sh patch | blob | history
vnfs/vLBMS/scripts/v_lb_install.sh patch | blob | history
vnfs/vLBMS/scripts/v_packetgen_install.sh patch | blob | history

diff --git a/heat/vCPE/infra/base_vcpe_infra.env b/heat/vCPE/infra/base_vcpe_infra.env
index 71454ff..dafe72f 100644 (file)
--- a/heat/vCPE/infra/base_vcpe_infra.env
+++ b/heat/vCPE/infra/base_vcpe_infra.env
@@ -30,9 +30,9 @@ parameters:
   dcae_collector_ip: 10.0.4.1
   dcae_collector_port: 8081
   repo_url_blob: https://nexus.onap.org/content/sites/raw
-  repo_url_artifacts: https://nexus.onap.org/content/groups/staging
-  demo_artifacts_version: 1.2.0
-  install_script_version: 1.2.0-SNAPSHOT
+  repo_url_artifacts: https://nexus.onap.org/content/repositories/releases
+  demo_artifacts_version: 1.2.1
+  install_script_version: 1.2.1
   key_name: vaaa_key
   pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
   cloud_env: PUT THE CLOUD PROVIDED HERE (openstack or rackspace)
diff --git a/heat/vCPE/vbng/base_vcpe_vbng.env b/heat/vCPE/vbng/base_vcpe_vbng.env
index 97f5ac9..0495cf0 100644 (file)
--- a/heat/vCPE/vbng/base_vcpe_vbng.env
+++ b/heat/vCPE/vbng/base_vcpe_vbng.env
@@ -25,9 +25,9 @@
   dcae_collector_ip: 10.0.4.1
   dcae_collector_port: 8081
   repo_url_blob: https://nexus.onap.org/content/sites/raw
-  repo_url_artifacts: https://nexus.onap.org/content/groups/staging
-  demo_artifacts_version: 1.2.0
-  install_script_version: 1.2.0-SNAPSHOT
+  repo_url_artifacts: https://nexus.onap.org/content/repositories/releases
+  demo_artifacts_version: 1.2.1
+  install_script_version: 1.2.1
   key_name: vbng_key
   pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
   cloud_env: PUT THE CLOUD PROVIDED HERE (openstack or rackspace)
diff --git a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env
index da97c39..272f23c 100644 (file)
--- a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env
+++ b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env
@@ -15,9 +15,9 @@
   vnf_id: vCPE_Infrastructure_BGREMU_demo_app
   vf_module_id: vCPE_Customer_BRGEMU
   repo_url_blob: https://nexus.onap.org/content/sites/raw
-  repo_url_artifacts: https://nexus.onap.org/content/groups/staging
-  demo_artifacts_version: 1.2.0
-  install_script_version: 1.2.0-SNAPSHOT
+  repo_url_artifacts: https://nexus.onap.org/content/repositories/releases
+  demo_artifacts_version: 1.2.1
+  install_script_version: 1.2.1
   key_name: vbrgemu_key
   pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh
   cloud_env: PUT THE CLOUD PROVIDED HERE (openstack or rackspace)
diff --git a/heat/vCPE/vgmux/base_vcpe_vgmux.env b/heat/vCPE/vgmux/base_vcpe_vgmux.env
index a76fde6..9e557ad 100644 (file)
--- a/heat/vCPE/vgmux/base_vcpe_vgmux.env
+++ b/heat/vCPE/vgmux/base_vcpe_vgmux.env
@@ -22,9 +22,9 @@
   dcae_collector_ip: 10.0.4.1
   dcae_collector_port: 8081
   repo_url_blob: https://nexus.onap.org/content/sites/raw
-  repo_url_artifacts: https://nexus.onap.org/content/groups/staging
-  demo_artifacts_version: 1.2.0
-  install_script_version: 1.2.0-SNAPSHOT
+  repo_url_artifacts: https://nexus.onap.org/content/repositories/releases
+  demo_artifacts_version: 1.2.1
+  install_script_version: 1.2.1
   key_name: vgmux_key
   pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
   cloud_env: PUT THE CLOUD PROVIDED HERE (openstack or rackspace)
diff --git a/heat/vCPE/vgw/base_vcpe_vgw.env b/heat/vCPE/vgw/base_vcpe_vgw.env
index d2f67a9..c6e2054 100644 (file)
--- a/heat/vCPE/vgw/base_vcpe_vgw.env
+++ b/heat/vCPE/vgw/base_vcpe_vgw.env
@@ -22,9 +22,9 @@
   dcae_collector_ip: 10.0.4.1
   dcae_collector_port: 8081
   repo_url_blob: https://nexus.onap.org/content/sites/raw
-  repo_url_artifacts: https://nexus.onap.org/content/groups/staging
-  demo_artifacts_version: 1.2.0
-  install_script_version: 1.2.0-SNAPSHOT
+  repo_url_artifacts: https://nexus.onap.org/content/repositories/releases
+  demo_artifacts_version: 1.2.1
+  install_script_version: 1.2.1
   key_name: vgw_key
   pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
   cloud_env: PUT THE CLOUD PROVIDED HERE (openstack or rackspace)
diff --git a/heat/vFW/base_vfw.env b/heat/vFW/base_vfw.env
index c6591ef..7f031f6 100644 (file)
--- a/heat/vFW/base_vfw.env
+++ b/heat/vFW/base_vfw.env
@@ -24,9 +24,9 @@ parameters:
   dcae_collector_ip: 10.0.4.1
   dcae_collector_port: 8081
   repo_url_blob: https://nexus.onap.org/content/sites/raw
-  repo_url_artifacts: https://nexus.onap.org/content/groups/staging
-  demo_artifacts_version: 1.2.0
-  install_script_version: 1.2.0-SNAPSHOT
+  repo_url_artifacts: https://nexus.onap.org/content/repositories/releases
+  demo_artifacts_version: 1.2.1
+  install_script_version: 1.2.1
   key_name: vfw_key
   pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
   cloud_env: PUT openstack OR rackspace HERE
diff --git a/heat/vFWCL/vFWSNK/base_vfw.env b/heat/vFWCL/vFWSNK/base_vfw.env
index aec1660..a6c4c73 100644 (file)
--- a/heat/vFWCL/vFWSNK/base_vfw.env
+++ b/heat/vFWCL/vFWSNK/base_vfw.env
@@ -24,9 +24,9 @@ parameters:
   dcae_collector_ip: 10.0.4.1
   dcae_collector_port: 8081
   repo_url_blob: https://nexus.onap.org/content/sites/raw
-  repo_url_artifacts: https://nexus.onap.org/content/groups/staging
-  demo_artifacts_version: 1.2.0
-  install_script_version: 1.2.0-SNAPSHOT
+  repo_url_artifacts: https://nexus.onap.org/content/repositories/releases
+  demo_artifacts_version: 1.2.1
+  install_script_version: 1.2.1
   key_name: vfw_key
   pub_key: PUT YOUR KEY HERE
   cloud_env: PUT openstack OR rackspace HERE
diff --git a/heat/vFWCL/vPKG/base_vpkg.env b/heat/vFWCL/vPKG/base_vpkg.env
index ff8d462..317fde9 100644 (file)
--- a/heat/vFWCL/vPKG/base_vpkg.env
+++ b/heat/vFWCL/vPKG/base_vpkg.env
@@ -17,9 +17,9 @@ parameters:
   vnf_id: vPNG_Firewall_demo_app
   vf_module_id: vTrafficPNG
   repo_url_blob: https://nexus.onap.org/content/sites/raw
-  repo_url_artifacts: https://nexus.onap.org/content/groups/staging
-  demo_artifacts_version: 1.2.0
-  install_script_version: 1.2.0-SNAPSHOT
+  repo_url_artifacts: https://nexus.onap.org/content/repositories/releases
+  demo_artifacts_version: 1.2.1
+  install_script_version: 1.2.1
   key_name: vfw_key
   pub_key: PUT YOUR PUBLIC KEY HERE
   cloud_env: PUT openstack OR rackspace HERE
diff --git a/heat/vLB/base_vlb.env b/heat/vLB/base_vlb.env
index c0a8334..78cc994 100644 (file)
--- a/heat/vLB/base_vlb.env
+++ b/heat/vLB/base_vlb.env
@@ -27,9 +27,9 @@ parameters:
   dcae_collector_ip: 10.0.4.1
   dcae_collector_port: 8081
   repo_url_blob: https://nexus.onap.org/content/sites/raw
-  repo_url_artifacts: https://nexus.onap.org/content/groups/staging
-  demo_artifacts_version: 1.2.0
-  install_script_version: 1.2.0-SNAPSHOT
+  repo_url_artifacts: https://nexus.onap.org/content/repositories/releases
+  demo_artifacts_version: 1.2.1
+  install_script_version: 1.2.1
   key_name: vlb_key
   pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
   cloud_env: PUT openstack OR backspace HERE
diff --git a/heat/vLB/dnsscaling.env b/heat/vLB/dnsscaling.env
index 2198374..2196337 100644 (file)
--- a/heat/vLB/dnsscaling.env
+++ b/heat/vLB/dnsscaling.env
@@ -15,9 +15,9 @@ parameters:
   vnf_id: vLoadBalancer_demo_app
   vf_module_id: vLoadBalancer
   repo_url_blob: https://nexus.onap.org/content/sites/raw
-  repo_url_artifacts: https://nexus.onap.org/content/groups/staging
-  demo_artifacts_version: 1.2.0
-  install_script_version: 1.2.0-SNAPSHOT
+  repo_url_artifacts: https://nexus.onap.org/content/repositories/releases
+  demo_artifacts_version: 1.2.1
+  install_script_version: 1.2.1
   key_name: vlb_key_scaling
   pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
   cloud_env: PUT openstack OR backspace HERE
\ No newline at end of file
diff --git a/heat/vLBMS/base_vlb.env b/heat/vLBMS/base_vlb.env
index c0a8334..3454fa4 100644 (file)
--- a/heat/vLBMS/base_vlb.env
+++ b/heat/vLBMS/base_vlb.env
@@ -27,9 +27,9 @@ parameters:
   dcae_collector_ip: 10.0.4.1
   dcae_collector_port: 8081
   repo_url_blob: https://nexus.onap.org/content/sites/raw
-  repo_url_artifacts: https://nexus.onap.org/content/groups/staging
+  repo_url_artifacts: https://nexus.onap.org/content/repositories/releases
   demo_artifacts_version: 1.2.0
-  install_script_version: 1.2.0-SNAPSHOT
+  install_script_version: 1.2.1
   key_name: vlb_key
   pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
   cloud_env: PUT openstack OR backspace HERE
diff --git a/heat/vLBMS/dnsscaling.env b/heat/vLBMS/dnsscaling.env
index 3fa627d..d40bf96 100644 (file)
--- a/heat/vLBMS/dnsscaling.env
+++ b/heat/vLBMS/dnsscaling.env
@@ -16,9 +16,9 @@ parameters:
   vnf_id: vLoadBalancer_demo_app
   vf_module_id: vLoadBalancer
   repo_url_blob: https://nexus.onap.org/content/sites/raw
-  repo_url_artifacts: https://nexus.onap.org/content/groups/staging
+  repo_url_artifacts: https://nexus.onap.org/content/repositories/releases
   demo_artifacts_version: 1.2.0
-  install_script_version: 1.2.0-SNAPSHOT
+  install_script_version: 1.2.1
   key_name: vlb_key_scaling
   pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
   cloud_env: PUT openstack OR backspace HERE
\ No newline at end of file
diff --git a/vnfs/vLBMS/scripts/v_dns_install.sh b/vnfs/vLBMS/scripts/v_dns_install.sh
index f4c9fbc..ae56a9b 100644 (file)
--- a/vnfs/vLBMS/scripts/v_dns_install.sh
+++ b/vnfs/vLBMS/scripts/v_dns_install.sh
@@ -69,7 +69,7 @@ cd honeycomb-api
 git remote add origin https://gerrit.onap.org/r/p/demo.git
 git config core.sparsecheckout true
 echo "vnfs/vLBMS/apis" >> .git/info/sparse-checkout
-git pull --depth=1 origin master
+git pull --depth=1 origin beijing
 
 mkdir ~/.m2
 cat > ~/.m2/settings.xml << EOF
diff --git a/vnfs/vLBMS/scripts/v_lb_install.sh b/vnfs/vLBMS/scripts/v_lb_install.sh
index 50678c7..e81bf10 100644 (file)
--- a/vnfs/vLBMS/scripts/v_lb_install.sh
+++ b/vnfs/vLBMS/scripts/v_lb_install.sh
@@ -84,7 +84,7 @@ cd honeycomb-api
 git remote add origin https://gerrit.onap.org/r/p/demo.git
 git config core.sparsecheckout true
 echo "vnfs/vLBMS/apis" >> .git/info/sparse-checkout
-git pull --depth=1 origin master
+git pull --depth=1 origin beijing
 
 mkdir ~/.m2
 cat > ~/.m2/settings.xml << EOF
diff --git a/vnfs/vLBMS/scripts/v_packetgen_install.sh b/vnfs/vLBMS/scripts/v_packetgen_install.sh
index 4127822..e4b4cbf 100644 (file)
--- a/vnfs/vLBMS/scripts/v_packetgen_install.sh
+++ b/vnfs/vLBMS/scripts/v_packetgen_install.sh
@@ -73,7 +73,7 @@ cd honeycomb-api
 git remote add origin https://gerrit.onap.org/r/p/demo.git
 git config core.sparsecheckout true
 echo "vnfs/vLBMS/apis" >> .git/info/sparse-checkout
-git pull --depth=1 origin master
+git pull --depth=1 origin beijing
 
 mkdir ~/.m2
 cat > ~/.m2/settings.xml << EOF
Demo applications and templates for ONAP platform instantiation.