aboutsummaryrefslogtreecommitdiffstats
path: root/heat
diff options
context:
space:
mode:
Diffstat (limited to 'heat')
-rw-r--r--heat/vCPE/infra/base_vcpe_infra.env3
-rw-r--r--heat/vCPE/infra/base_vcpe_infra.yaml36
-rw-r--r--heat/vCPE/vbng/base_vcpe_vbng.env3
-rw-r--r--heat/vCPE/vbng/base_vcpe_vbng.yaml15
-rw-r--r--heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env3
-rw-r--r--heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml15
-rw-r--r--heat/vCPE/vgmux/base_vcpe_vgmux.env3
-rw-r--r--heat/vCPE/vgmux/base_vcpe_vgmux.yaml15
-rw-r--r--heat/vCPE/vgw/base_vcpe_vgw.env3
-rw-r--r--heat/vCPE/vgw/base_vcpe_vgw.yaml15
-rw-r--r--heat/vFW/base_vfw.env3
-rw-r--r--heat/vFW/base_vfw.yaml29
-rw-r--r--heat/vFWCL/vFWSNK/base_vfw.env3
-rw-r--r--heat/vFWCL/vFWSNK/base_vfw.yaml22
-rw-r--r--heat/vFWCL/vPKG/base_vpkg.env3
-rw-r--r--heat/vFWCL/vPKG/base_vpkg.yaml15
-rw-r--r--heat/vLB/base_vlb.env3
-rw-r--r--heat/vLB/base_vlb.yaml29
-rw-r--r--heat/vLB/dnsscaling.env3
-rw-r--r--heat/vLB/dnsscaling.yaml15
-rw-r--r--heat/vLBMS/base_vlb.env3
-rw-r--r--heat/vLBMS/base_vlb.yaml25
-rw-r--r--heat/vLBMS/dnsscaling.env3
-rw-r--r--heat/vLBMS/dnsscaling.yaml11
24 files changed, 140 insertions, 138 deletions
diff --git a/heat/vCPE/infra/base_vcpe_infra.env b/heat/vCPE/infra/base_vcpe_infra.env
index 64fc0930..0691917e 100644
--- a/heat/vCPE/infra/base_vcpe_infra.env
+++ b/heat/vCPE/infra/base_vcpe_infra.env
@@ -29,10 +29,9 @@ parameters:
vf_module_id: vCPE_Intrastructure
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/repositories/releases
demo_artifacts_version: 1.3.0-SNAPSHOT
- install_script_version: 1.2.1
+ install_script_version: 1.3.0-SNAPSHOT
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/infra/base_vcpe_infra.yaml b/heat/vCPE/infra/base_vcpe_infra.yaml
index 1f409f2f..c7d31f85 100644
--- a/heat/vCPE/infra/base_vcpe_infra.yaml
+++ b/heat/vCPE/infra/base_vcpe_infra.yaml
@@ -161,10 +161,6 @@ parameters:
type: string
label: Public key
description: Public key to be installed on the compute instance
- repo_url_blob:
- type: string
- label: Repository URL
- description: URL of the repository that hosts the demo packages
repo_url_artifacts:
type: string
label: Repository URL
@@ -177,6 +173,10 @@ parameters:
type: string
label: Artifacts version used in demo vnfs
description: Artifacts (jar, tar.gz) version used in demo vnfs
+ nexus_artifact_repo:
+ type: string
+ description: Root URL for the Nexus repository for Maven artifacts.
+ default: "https://nexus.onap.org"
cloud_env:
type: string
label: Cloud environment
@@ -243,7 +243,6 @@ resources:
__oam_ipaddr__: { get_param: vaaa_private_ip_1 }
__oam_cidr__: { get_param: onap_private_net_cidr }
__cpe_signal_net_cidr__: { get_param: cpe_signal_net_cidr }
- __repo_url_blob__ : { get_param: repo_url_blob }
__repo_url_artifacts__ : { get_param: repo_url_artifacts }
__demo_artifacts_version__ : { get_param: demo_artifacts_version }
__install_script_version__ : { get_param: install_script_version }
@@ -259,14 +258,16 @@ resources:
echo "__oam_ipaddr__" > /opt/config/oam_ipaddr.txt
echo "__oam_cidr__" > /opt/config/oam_cidr.txt
echo "__cpe_signal_net_cidr__" > /opt/config/cpe_signal_net_cidr.txt
- echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt
echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
echo "__install_script_version__" > /opt/config/install_script_version.txt
echo "__cloud_env__" > /opt/config/cloud_env.txt
# Download and run install script
- curl -k __repo_url_blob__/org.onap.demo/vnfs/vcpe/__install_script_version__/v_aaa_install.sh -o /opt/v_aaa_install.sh
+ apt-get -y install unzip
+ if [[ "__install_script_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vcpe&a=vcpe-scripts&e=zip&v=__install_script_version__" -o /opt/vcpe-scripts-__install_script_version__.zip
+ unzip -j /opt/vcpe-scripts-__install_script_version__.zip -d /opt v_aaa_install.sh
cd /opt
chmod +x v_aaa_install.sh
./v_aaa_install.sh
@@ -305,7 +306,6 @@ resources:
__cpe_public_net_ipaddr__: { get_param: vdns_private_ip_0 }
__oam_cidr__: { get_param: onap_private_net_cidr }
__cpe_public_net_cidr__: { get_param: cpe_public_net_cidr }
- __repo_url_blob__ : { get_param: repo_url_blob }
__repo_url_artifacts__ : { get_param: repo_url_artifacts }
__demo_artifacts_version__ : { get_param: demo_artifacts_version }
__install_script_version__ : { get_param: install_script_version }
@@ -319,14 +319,16 @@ resources:
echo "__cpe_public_net_ipaddr__" > /opt/config/cpe_public_net_ipaddr.txt
echo "__oam_cidr__" > /opt/config/oam_cidr.txt
echo "__cpe_public_net_cidr__" > /opt/config/cpe_public_net_cidr.txt
- echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt
echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
echo "__install_script_version__" > /opt/config/install_script_version.txt
echo "__cloud_env__" > /opt/config/cloud_env.txt
# Download and run install script
- curl -k __repo_url_blob__/org.onap.demo/vnfs/vcpe/__install_script_version__/v_dns_install.sh -o /opt/v_dns_install.sh
+ apt-get -y install unzip
+ if [[ "__install_script_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vcpe&a=vcpe-scripts&e=zip&v=__install_script_version__" -o /opt/vcpe-scripts-__install_script_version__.zip
+ unzip -j /opt/vcpe-scripts-__install_script_version__.zip -d /opt v_dns_install.sh
cd /opt
chmod +x v_dns_install.sh
./v_dns_install.sh
@@ -367,7 +369,6 @@ resources:
__cpe_signal_net_cidr__ : { get_param: cpe_signal_net_cidr }
__mr_ip_addr__ : { get_param: mr_ip_addr }
__mr_ip_port__ : { get_param: mr_ip_port }
- __repo_url_blob__ : { get_param: repo_url_blob }
__repo_url_artifacts__ : { get_param: repo_url_artifacts }
__demo_artifacts_version__ : { get_param: demo_artifacts_version }
__install_script_version__ : { get_param: install_script_version }
@@ -383,14 +384,16 @@ resources:
echo "__cpe_signal_net_cidr__" > /opt/config/cpe_signal_net_cidr.txt
echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt
echo "__mr_ip_port__" > /opt/config/mr_ip_port.txt
- echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt
echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
echo "__install_script_version__" > /opt/config/install_script_version.txt
echo "__cloud_env__" > /opt/config/cloud_env.txt
# Download and run install script
- curl -k __repo_url_blob__/org.onap.demo/vnfs/vcpe/__install_script_version__/v_dhcp_install.sh -o /opt/v_dhcp_install.sh
+ apt-get -y install unzip
+ if [[ "__install_script_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vcpe&a=vcpe-scripts&e=zip&v=__install_script_version__" -o /opt/vcpe-scripts-__install_script_version__.zip
+ unzip -j /opt/vcpe-scripts-__install_script_version__.zip -d /opt v_dhcp_install.sh
cd /opt
chmod +x v_dhcp_install.sh
./v_dhcp_install.sh
@@ -429,7 +432,6 @@ resources:
__cpe_public_ipaddr__: { get_param: vweb_private_ip_0 }
__oam_cidr__: { get_param: onap_private_net_cidr }
__cpe_public_net_cidr__: { get_param: cpe_public_net_cidr }
- __repo_url_blob__ : { get_param: repo_url_blob }
__repo_url_artifacts__ : { get_param: repo_url_artifacts }
__demo_artifacts_version__ : { get_param: demo_artifacts_version }
__install_script_version__ : { get_param: install_script_version }
@@ -443,14 +445,16 @@ resources:
echo "__cpe_public_ipaddr__" > /opt/config/cpe_public_ipaddr.txt
echo "__oam_cidr__" > /opt/config/oam_cidr.txt
echo "__cpe_public_net_cidr__" > /opt/config/cpe_public_net_cidr.txt
- echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt
echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
echo "__install_script_version__" > /opt/config/install_script_version.txt
echo "__cloud_env__" > /opt/config/cloud_env.txt
# Download and run install script
- curl -k __repo_url_blob__/org.onap.demo/vnfs/vcpe/__install_script_version__/v_web_install.sh -o /opt/v_web_install.sh
+ apt-get -y install unzip
+ if [[ "__install_script_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vcpe&a=vcpe-scripts&e=zip&v=__install_script_version__" -o /opt/vcpe-scripts-__install_script_version__.zip
+ unzip -j /opt/vcpe-scripts-__install_script_version__.zip -d /opt v_web_install.sh
cd /opt
chmod +x v_web_install.sh
./v_web_install.sh
diff --git a/heat/vCPE/vbng/base_vcpe_vbng.env b/heat/vCPE/vbng/base_vcpe_vbng.env
index 09a5b3bb..45592649 100644
--- a/heat/vCPE/vbng/base_vcpe_vbng.env
+++ b/heat/vCPE/vbng/base_vcpe_vbng.env
@@ -24,10 +24,9 @@
sdnc_ip_addr: 10.0.7.1
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/repositories/releases
demo_artifacts_version: 1.3.0-SNAPSHOT
- install_script_version: 1.2.1
+ install_script_version: 1.3.0-SNAPSHOT
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/vbng/base_vcpe_vbng.yaml b/heat/vCPE/vbng/base_vcpe_vbng.yaml
index b6da581a..b00e2f81 100644
--- a/heat/vCPE/vbng/base_vcpe_vbng.yaml
+++ b/heat/vCPE/vbng/base_vcpe_vbng.yaml
@@ -137,10 +137,6 @@ parameters:
type: string
label: Public key
description: Public key to be installed on the compute instance
- repo_url_blob:
- type: string
- label: Repository URL
- description: URL of the repository that hosts the demo packages
repo_url_artifacts:
type: string
label: Repository URL
@@ -153,6 +149,10 @@ parameters:
type: string
label: Artifacts version used in demo vnfs
description: Artifacts (jar, tar.gz) version used in demo vnfs
+ nexus_artifact_repo:
+ type: string
+ description: Root URL for the Nexus repository for Maven artifacts.
+ default: "https://nexus.onap.org"
cloud_env:
type: string
label: Cloud environment
@@ -253,7 +253,6 @@ resources:
__bng_gmux_cidr__: { get_param: bng_gmux_private_net_cidr }
__dcae_collector_ip__: { get_param: dcae_collector_ip }
__dcae_collector_port__: { get_param: dcae_collector_port }
- __repo_url_blob__ : { get_param: repo_url_blob }
__repo_url_artifacts__ : { get_param: repo_url_artifacts }
__demo_artifacts_version__ : { get_param: demo_artifacts_version }
__install_script_version__ : { get_param: install_script_version }
@@ -277,7 +276,6 @@ resources:
echo "__brgemu_bng_cidr__" > /opt/config/brgemu_bng_net_cidr.txt
echo "__dcae_collector_ip__" > /opt/config/dcae_collector_ip.txt
echo "__dcae_collector_port__" > /opt/config/dcae_collector_port.txt
- echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt
echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
echo "__install_script_version__" > /opt/config/install_script_version.txt
@@ -288,7 +286,10 @@ resources:
echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt
# Download and run install script
- curl -k __repo_url_blob__/org.onap.demo/vnfs/vcpe/__install_script_version__/v_bng_install.sh -o /opt/v_bng_install.sh
+ apt-get -y install unzip
+ if [[ "__install_script_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vcpe&a=vcpe-scripts&e=zip&v=__install_script_version__" -o /opt/vcpe-scripts-__install_script_version__.zip
+ unzip -j /opt/vcpe-scripts-__install_script_version__.zip -d /opt v_bng_install.sh
cd /opt
chmod +x v_bng_install.sh
./v_bng_install.sh
diff --git a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env
index e18fbc20..7ac57ea9 100644
--- a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env
+++ b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env
@@ -14,10 +14,9 @@
vbrgemu_name_0: zdcpe1cpe01brgemu01
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/repositories/releases
demo_artifacts_version: 1.3.0-SNAPSHOT
- install_script_version: 1.2.1
+ install_script_version: 1.3.0-SNAPSHOT
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/vbrgemu/base_vcpe_vbrgemu.yaml b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml
index 52941794..8a737ebf 100644
--- a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml
+++ b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml
@@ -96,10 +96,6 @@ parameters:
type: string
label: Public key
description: Public key to be installed on the compute instance
- repo_url_blob:
- type: string
- label: Repository URL
- description: URL of the repository that hosts the demo packages
repo_url_artifacts:
type: string
label: Repository URL
@@ -112,6 +108,10 @@ parameters:
type: string
label: Artifacts version used in demo vnfs
description: Artifacts (jar, tar.gz) version used in demo vnfs
+ nexus_artifact_repo:
+ type: string
+ description: Root URL for the Nexus repository for Maven artifacts.
+ default: "https://nexus.onap.org"
cloud_env:
type: string
label: Cloud environment
@@ -215,7 +215,6 @@ resources:
# __brgemu_net_ipaddr__: { get_param: vbrgemu_private_ip_1 }
# __brgemu_cidr__: { get_param: vbrgemu_private_net_cidr }
__brgemu_bng_private_net_cidr__: { get_param: vbrgemu_bng_private_net_cidr }
- __repo_url_blob__ : { get_param: repo_url_blob }
__repo_url_artifacts__ : { get_param: repo_url_artifacts }
__demo_artifacts_version__ : { get_param: demo_artifacts_version }
__install_script_version__ : { get_param: install_script_version }
@@ -235,7 +234,6 @@ resources:
#echo "__brgemu_net_ipaddr__" > /opt/config/brgemu_net_ipaddr.txt
#echo "__brgemu_cidr__" > /opt/config/brgemu_net_cidr.txt
echo "__brgemu_bng_private_net_cidr__" > /opt/config/brgemu_bng_private_net_cidr.txt
- echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt
echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
echo "__install_script_version__" > /opt/config/install_script_version.txt
@@ -249,7 +247,10 @@ resources:
echo "__compile_state__" > /opt/config/compile_state.txt
# Download and run install script
- curl -k __repo_url_blob__/org.onap.demo/vnfs/vcpe/__install_script_version__/v_brgemu_install.sh -o /opt/v_brgemu_install.sh
+ apt-get -y install unzip
+ if [[ "__install_script_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vcpe&a=vcpe-scripts&e=zip&v=__install_script_version__" -o /opt/vcpe-scripts-__install_script_version__.zip
+ unzip -j /opt/vcpe-scripts-__install_script_version__.zip -d /opt v_brgemu_install.sh
cd /opt
chmod +x v_brgemu_install.sh
./v_brgemu_install.sh
diff --git a/heat/vCPE/vgmux/base_vcpe_vgmux.env b/heat/vCPE/vgmux/base_vcpe_vgmux.env
index 8f495409..a2988fcb 100644
--- a/heat/vCPE/vgmux/base_vcpe_vgmux.env
+++ b/heat/vCPE/vgmux/base_vcpe_vgmux.env
@@ -21,10 +21,9 @@
bng_gmux_private_ip: 10.1.0.10
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/repositories/releases
demo_artifacts_version: 1.3.0-SNAPSHOT
- install_script_version: 1.2.1
+ install_script_version: 1.3.0-SNAPSHOT
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/vgmux/base_vcpe_vgmux.yaml b/heat/vCPE/vgmux/base_vcpe_vgmux.yaml
index b08d5c3c..870f2c16 100644
--- a/heat/vCPE/vgmux/base_vcpe_vgmux.yaml
+++ b/heat/vCPE/vgmux/base_vcpe_vgmux.yaml
@@ -129,10 +129,6 @@ parameters:
type: string
label: Public key
description: Public key to be installed on the compute instance
- repo_url_blob:
- type: string
- label: Repository URL
- description: URL of the repository that hosts the demo packages
repo_url_artifacts:
type: string
label: Repository URL
@@ -145,6 +141,10 @@ parameters:
type: string
label: Artifacts version used in demo vnfs
description: Artifacts (jar, tar.gz) version used in demo vnfs
+ nexus_artifact_repo:
+ type: string
+ description: Root URL for the Nexus repository for Maven artifacts.
+ default: "https://nexus.onap.org"
cloud_env:
type: string
label: Cloud environment
@@ -248,7 +248,6 @@ resources:
__oam_cidr__ : { get_param: onap_private_net_cidr }
__mux_gw_net_cidr__ : { get_param: mux_gw_private_net_cidr }
__brg_bng_net_cidr__ : { get_param: brgemu_bng_private_net_cidr }
- __repo_url_blob__ : { get_param: repo_url_blob }
__repo_url_artifacts__ : { get_param: repo_url_artifacts }
__demo_artifacts_version__ : { get_param: demo_artifacts_version }
__install_script_version__ : { get_param: install_script_version }
@@ -273,7 +272,6 @@ resources:
echo "__oam_cidr__" > /opt/config/oam_cidr.txt
echo "__mux_gw_net_cidr__" > /opt/config/mux_gw_net_cidr.txt
echo "__brg_bng_net_cidr__" > /opt/config/brg_bng_net_cidr.txt
- echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt
echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
echo "__install_script_version__" > /opt/config/install_script_version.txt
@@ -287,7 +285,10 @@ resources:
echo "__libevel_patch_url__" > /opt/config/libevel_patch_url.txt
# Download and run install script
- curl -k __repo_url_blob__/org.onap.demo/vnfs/vcpe/__install_script_version__/v_gmux_install.sh -o /opt/v_gmux_install.sh
+ apt-get -y install unzip
+ if [[ "__install_script_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vcpe&a=vcpe-scripts&e=zip&v=__install_script_version__" -o /opt/vcpe-scripts-__install_script_version__.zip
+ unzip -j /opt/vcpe-scripts-__install_script_version__.zip -d /opt v_gmux_install.sh
cd /opt
chmod +x v_gmux_install.sh
./v_gmux_install.sh
diff --git a/heat/vCPE/vgw/base_vcpe_vgw.env b/heat/vCPE/vgw/base_vcpe_vgw.env
index 7bd918b5..ea051625 100644
--- a/heat/vCPE/vgw/base_vcpe_vgw.env
+++ b/heat/vCPE/vgw/base_vcpe_vgw.env
@@ -22,10 +22,9 @@
vg_vgmux_tunnel_vni: 100
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/repositories/releases
demo_artifacts_version: 1.3.0-SNAPSHOT
- install_script_version: 1.2.1
+ install_script_version: 1.3.0-SNAPSHOT
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/vCPE/vgw/base_vcpe_vgw.yaml b/heat/vCPE/vgw/base_vcpe_vgw.yaml
index 02fd999f..890b9f44 100644
--- a/heat/vCPE/vgw/base_vcpe_vgw.yaml
+++ b/heat/vCPE/vgw/base_vcpe_vgw.yaml
@@ -122,10 +122,6 @@ parameters:
type: string
label: Public key
description: Public key to be installed on the compute instance
- repo_url_blob:
- type: string
- label: Repository URL
- description: URL of the repository that hosts the demo packages
repo_url_artifacts:
type: string
label: Repository URL
@@ -138,6 +134,10 @@ parameters:
type: string
label: Artifacts version used in demo vnfs
description: Artifacts (jar, tar.gz) version used in demo vnfs
+ nexus_artifact_repo:
+ type: string
+ description: Root URL for the Nexus repository for Maven artifacts.
+ default: "https://nexus.onap.org"
cloud_env:
type: string
label: Cloud environment
@@ -234,7 +234,6 @@ resources:
__oam_cidr__ : { get_param: onap_private_net_cidr }
__cpe_public_net_cidr__ : { get_param: cpe_public_net_cidr }
__mux_gw_private_net_cidr__ : { get_param: mux_gw_private_net_cidr }
- __repo_url_blob__ : { get_param: repo_url_blob }
__repo_url_artifacts__ : { get_param: repo_url_artifacts }
__demo_artifacts_version__ : { get_param: demo_artifacts_version }
__install_script_version__ : { get_param: install_script_version }
@@ -255,7 +254,6 @@ resources:
echo "__cpe_public_net_cidr__" > /opt/config/cpe_public_net_cidr.txt
echo "__mux_gw_private_net_ipaddr__" > /opt/config/mux_gw_private_net_ipaddr.txt
echo "__mux_gw_private_net_cidr__" > /opt/config/mux_gw_private_net_cidr.txt
- echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt
echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
echo "__install_script_version__" > /opt/config/install_script_version.txt
@@ -268,7 +266,10 @@ resources:
echo "__vg_vgmux_tunnel_vni__" > /opt/config/vg_vgmux_tunnel_vni.txt
# Download and run install script
- curl -k __repo_url_blob__/org.onap.demo/vnfs/vcpe/__install_script_version__/v_gw_install.sh -o /opt/v_gw_install.sh
+ apt-get -y install unzip
+ if [[ "__install_script_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vcpe&a=vcpe-scripts&e=zip&v=__install_script_version__" -o /opt/vcpe-scripts-__install_script_version__.zip
+ unzip -j /opt/vcpe-scripts-__install_script_version__.zip -d /opt v_gw_install.sh
cd /opt
chmod +x v_gw_install.sh
./v_gw_install.sh
diff --git a/heat/vFW/base_vfw.env b/heat/vFW/base_vfw.env
index 86f3e383..dfa09a03 100644
--- a/heat/vFW/base_vfw.env
+++ b/heat/vFW/base_vfw.env
@@ -23,10 +23,9 @@ parameters:
vf_module_id: vFirewall
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/repositories/releases
demo_artifacts_version: 1.3.0-SNAPSHOT
- install_script_version: 1.2.1
+ install_script_version: 1.3.0-SNAPSHOT
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/vFW/base_vfw.yaml b/heat/vFW/base_vfw.yaml
index ace7c5e1..ebc0132e 100644
--- a/heat/vFW/base_vfw.yaml
+++ b/heat/vFW/base_vfw.yaml
@@ -137,10 +137,6 @@ parameters:
type: string
label: Public key
description: Public key to be installed on the compute instance
- repo_url_blob:
- type: string
- label: Repository URL
- description: URL of the repository that hosts the demo packages
repo_url_artifacts:
type: string
label: Repository URL
@@ -153,6 +149,10 @@ parameters:
type: string
label: Artifacts version used in demo vnfs
description: Artifacts (jar, tar.gz) version used in demo vnfs
+ nexus_artifact_repo:
+ type: string
+ description: Root URL for the Nexus repository for Maven artifacts.
+ default: "https://nexus.onap.org"
cloud_env:
type: string
label: Cloud environment
@@ -243,7 +243,6 @@ resources:
params:
__dcae_collector_ip__ : { get_param: dcae_collector_ip }
__dcae_collector_port__ : { get_param: dcae_collector_port }
- __repo_url_blob__ : { get_param: repo_url_blob }
__repo_url_artifacts__ : { get_param: repo_url_artifacts }
__demo_artifacts_version__ : { get_param: demo_artifacts_version }
__install_script_version__ : { get_param: install_script_version }
@@ -261,7 +260,6 @@ resources:
mkdir /opt/config
echo "__dcae_collector_ip__" > /opt/config/dcae_collector_ip.txt
echo "__dcae_collector_port__" > /opt/config/dcae_collector_port.txt
- echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt
echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
echo "__install_script_version__" > /opt/config/install_script_version.txt
@@ -274,7 +272,10 @@ resources:
echo "__cloud_env__" > /opt/config/cloud_env.txt
# Download and run install script
- curl -k __repo_url_blob__/org.onap.demo/vnfs/vfw/__install_script_version__/v_firewall_install.sh -o /opt/v_firewall_install.sh
+ apt-get -y install unzip
+ if [[ "__install_script_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vfw&a=vfw-scripts&e=zip&v=__install_script_version__" -o /opt/vfw-scripts-__install_script_version__.zip
+ unzip -j /opt/vfw-scripts-__install_script_version__.zip -d /opt v_firewall_install.sh
cd /opt
chmod +x v_firewall_install.sh
./v_firewall_install.sh
@@ -312,7 +313,6 @@ resources:
__fw_ipaddr__: { get_param: vfw_private_ip_0 }
__protected_net_cidr__: { get_param: protected_private_net_cidr }
__sink_ipaddr__: { get_param: vsn_private_ip_0 }
- __repo_url_blob__ : { get_param: repo_url_blob }
__repo_url_artifacts__ : { get_param: repo_url_artifacts }
__demo_artifacts_version__ : { get_param: demo_artifacts_version }
__install_script_version__ : { get_param: install_script_version }
@@ -329,7 +329,6 @@ resources:
echo "__fw_ipaddr__" > /opt/config/fw_ipaddr.txt
echo "__protected_net_cidr__" > /opt/config/protected_net_cidr.txt
echo "__sink_ipaddr__" > /opt/config/sink_ipaddr.txt
- echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt
echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
echo "__install_script_version__" > /opt/config/install_script_version.txt
@@ -340,7 +339,10 @@ resources:
echo "__cloud_env__" > /opt/config/cloud_env.txt
# Download and run install script
- curl -k __repo_url_blob__/org.onap.demo/vnfs/vfw/__install_script_version__/v_packetgen_install.sh -o /opt/v_packetgen_install.sh
+ apt-get -y install unzip
+ if [[ "__install_script_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vfw&a=vfw-scripts&e=zip&v=__install_script_version__" -o /opt/vfw-scripts-__install_script_version__.zip
+ unzip -j /opt/vfw-scripts-__install_script_version__.zip -d /opt v_packetgen_install.sh
cd /opt
chmod +x v_packetgen_install.sh
./v_packetgen_install.sh
@@ -377,7 +379,6 @@ resources:
params:
__protected_net_gw__: { get_param: vfw_private_ip_1 }
__unprotected_net__: { get_param: unprotected_private_net_cidr }
- __repo_url_blob__ : { get_param: repo_url_blob }
__repo_url_artifacts__ : { get_param: repo_url_artifacts }
__install_script_version__ : { get_param: install_script_version }
__vsn_private_ip_0__ : { get_param: vsn_private_ip_0 }
@@ -392,7 +393,6 @@ resources:
mkdir /opt/config
echo "__protected_net_gw__" > /opt/config/protected_net_gw.txt
echo "__unprotected_net__" > /opt/config/unprotected_net.txt
- echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt
echo "__install_script_version__" > /opt/config/install_script_version.txt
echo "__vsn_private_ip_0__" > /opt/config/vsn_private_ip_0.txt
echo "__vsn_private_ip_1__" > /opt/config/vsn_private_ip_1.txt
@@ -401,7 +401,10 @@ resources:
echo "__cloud_env__" > /opt/config/cloud_env.txt
# Download and run install script
- curl -k __repo_url_blob__/org.onap.demo/vnfs/vfw/__install_script_version__/v_sink_install.sh -o /opt/v_sink_install.sh
+ apt-get -y install unzip
+ if [[ "__install_script_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vfw&a=vfw-scripts&e=zip&v=__install_script_version__" -o /opt/vfw-scripts-__install_script_version__.zip
+ unzip -j /opt/vfw-scripts-__install_script_version__.zip -d /opt v_sink_install.sh
cd /opt
chmod +x v_sink_install.sh
./v_sink_install.sh \ No newline at end of file
diff --git a/heat/vFWCL/vFWSNK/base_vfw.env b/heat/vFWCL/vFWSNK/base_vfw.env
index 887987ae..338a2a21 100644
--- a/heat/vFWCL/vFWSNK/base_vfw.env
+++ b/heat/vFWCL/vFWSNK/base_vfw.env
@@ -23,10 +23,9 @@ parameters:
vf_module_id: vFirewallCL
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/repositories/releases
demo_artifacts_version: 1.3.0-SNAPSHOT
- install_script_version: 1.2.1
+ install_script_version: 1.3.0-SNAPSHOT
key_name: vfw_key
pub_key: PUT YOUR KEY HERE
cloud_env: PUT openstack OR rackspace HERE
diff --git a/heat/vFWCL/vFWSNK/base_vfw.yaml b/heat/vFWCL/vFWSNK/base_vfw.yaml
index fe7f8dc6..0164f5b1 100644
--- a/heat/vFWCL/vFWSNK/base_vfw.yaml
+++ b/heat/vFWCL/vFWSNK/base_vfw.yaml
@@ -137,10 +137,6 @@ parameters:
type: string
label: Public key
description: Public key to be installed on the compute instance
- repo_url_blob:
- type: string
- label: Repository URL
- description: URL of the repository that hosts the demo packages
repo_url_artifacts:
type: string
label: Repository URL
@@ -153,6 +149,10 @@ parameters:
type: string
label: Artifacts version used in demo vnfs
description: Artifacts (jar, tar.gz) version used in demo vnfs
+ nexus_artifact_repo:
+ type: string
+ description: Root URL for the Nexus repository for Maven artifacts.
+ default: "https://nexus.onap.org"
cloud_env:
type: string
label: Cloud environment
@@ -245,7 +245,6 @@ resources:
params:
__dcae_collector_ip__ : { get_param: dcae_collector_ip }
__dcae_collector_port__ : { get_param: dcae_collector_port }
- __repo_url_blob__ : { get_param: repo_url_blob }
__repo_url_artifacts__ : { get_param: repo_url_artifacts }
__demo_artifacts_version__ : { get_param: demo_artifacts_version }
__install_script_version__ : { get_param: install_script_version }
@@ -263,7 +262,6 @@ resources:
mkdir /opt/config
echo "__dcae_collector_ip__" > /opt/config/dcae_collector_ip.txt
echo "__dcae_collector_port__" > /opt/config/dcae_collector_port.txt
- echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt
echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
echo "__install_script_version__" > /opt/config/install_script_version.txt
@@ -276,7 +274,10 @@ resources:
echo "__cloud_env__" > /opt/config/cloud_env.txt
# Download and run install script
- curl -k __repo_url_blob__/org.onap.demo/vnfs/vfw/__install_script_version__/v_firewall_install.sh -o /opt/v_firewall_install.sh
+ apt-get -y install unzip
+ if [[ "__install_script_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vfw&a=vfw-scripts&e=zip&v=__install_script_version__" -o /opt/vfw-scripts-__install_script_version__.zip
+ unzip -j /opt/vfw-scripts-__install_script_version__.zip -d /opt v_firewall_install.sh
cd /opt
chmod +x v_firewall_install.sh
./v_firewall_install.sh
@@ -313,7 +314,6 @@ resources:
params:
__protected_net_gw__: { get_param: vfw_private_ip_1 }
__unprotected_net__: { get_param: unprotected_private_net_cidr }
- __repo_url_blob__ : { get_param: repo_url_blob }
__repo_url_artifacts__ : { get_param: repo_url_artifacts }
__install_script_version__ : { get_param: install_script_version }
__vsn_private_ip_0__ : { get_param: vsn_private_ip_0 }
@@ -328,7 +328,6 @@ resources:
mkdir /opt/config
echo "__protected_net_gw__" > /opt/config/protected_net_gw.txt
echo "__unprotected_net__" > /opt/config/unprotected_net.txt
- echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt
echo "__install_script_version__" > /opt/config/install_script_version.txt
echo "__vsn_private_ip_0__" > /opt/config/vsn_private_ip_0.txt
echo "__vsn_private_ip_1__" > /opt/config/vsn_private_ip_1.txt
@@ -337,7 +336,10 @@ resources:
echo "__cloud_env__" > /opt/config/cloud_env.txt
# Download and run install script
- curl -k __repo_url_blob__/org.onap.demo/vnfs/vfw/__install_script_version__/v_sink_install.sh -o /opt/v_sink_install.sh
+ apt-get -y install unzip
+ if [[ "__install_script_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vfw&a=vfw-scripts&e=zip&v=__install_script_version__" -o /opt/vfw-scripts-__install_script_version__.zip
+ unzip -j /opt/vfw-scripts-__install_script_version__.zip -d /opt v_sink_install.sh
cd /opt
chmod +x v_sink_install.sh
./v_sink_install.sh
diff --git a/heat/vFWCL/vPKG/base_vpkg.env b/heat/vFWCL/vPKG/base_vpkg.env
index be1515d9..cf1a7d0c 100644
--- a/heat/vFWCL/vPKG/base_vpkg.env
+++ b/heat/vFWCL/vPKG/base_vpkg.env
@@ -16,10 +16,9 @@ parameters:
vpg_name_0: zdfw1fwl01pgn01
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/repositories/releases
demo_artifacts_version: 1.3.0-SNAPSHOT
- install_script_version: 1.2.1
+ install_script_version: 1.3.0-SNAPSHOT
key_name: vfw_key
pub_key: PUT YOUR PUBLIC KEY HERE
cloud_env: PUT openstack OR rackspace HERE
diff --git a/heat/vFWCL/vPKG/base_vpkg.yaml b/heat/vFWCL/vPKG/base_vpkg.yaml
index 160331bf..106426b2 100644
--- a/heat/vFWCL/vPKG/base_vpkg.yaml
+++ b/heat/vFWCL/vPKG/base_vpkg.yaml
@@ -109,10 +109,6 @@ parameters:
type: string
label: Public key
description: Public key to be installed on the compute instance
- repo_url_blob:
- type: string
- label: Repository URL
- description: URL of the repository that hosts the demo packages
repo_url_artifacts:
type: string
label: Repository URL
@@ -125,6 +121,10 @@ parameters:
type: string
label: Artifacts version used in demo vnfs
description: Artifacts (jar, tar.gz) version used in demo vnfs
+ nexus_artifact_repo:
+ type: string
+ description: Root URL for the Nexus repository for Maven artifacts.
+ default: "https://nexus.onap.org"
cloud_env:
type: string
label: Cloud environment
@@ -187,7 +187,6 @@ resources:
__fw_ipaddr__: { get_param: vfw_private_ip_0 }
__protected_net_cidr__: { get_param: protected_private_net_cidr }
__sink_ipaddr__: { get_param: vsn_private_ip_0 }
- __repo_url_blob__ : { get_param: repo_url_blob }
__repo_url_artifacts__ : { get_param: repo_url_artifacts }
__demo_artifacts_version__ : { get_param: demo_artifacts_version }
__install_script_version__ : { get_param: install_script_version }
@@ -204,7 +203,6 @@ resources:
echo "__fw_ipaddr__" > /opt/config/fw_ipaddr.txt
echo "__protected_net_cidr__" > /opt/config/protected_net_cidr.txt
echo "__sink_ipaddr__" > /opt/config/sink_ipaddr.txt
- echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt
echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
echo "__install_script_version__" > /opt/config/install_script_version.txt
@@ -215,7 +213,10 @@ resources:
echo "__cloud_env__" > /opt/config/cloud_env.txt
# Download and run install script
- curl -k __repo_url_blob__/org.onap.demo/vnfs/vfw/__install_script_version__/v_packetgen_install.sh -o /opt/v_packetgen_install.sh
+ apt-get -y install unzip
+ if [[ "__install_script_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vfw&a=vfw-scripts&e=zip&v=__install_script_version__" -o /opt/vfw-scripts-__install_script_version__.zip
+ unzip -j /opt/vfw-scripts-__install_script_version__.zip -d /opt v_packetgen_install.sh
cd /opt
chmod +x v_packetgen_install.sh
./v_packetgen_install.sh
diff --git a/heat/vLB/base_vlb.env b/heat/vLB/base_vlb.env
index aa21eccc..dee69cdd 100644
--- a/heat/vLB/base_vlb.env
+++ b/heat/vLB/base_vlb.env
@@ -26,10 +26,9 @@ parameters:
vf_module_id: vLoadBalancer
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/repositories/releases
demo_artifacts_version: 1.3.0-SNAPSHOT
- install_script_version: 1.2.1
+ install_script_version: 1.3.0-SNAPSHOT
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/base_vlb.yaml b/heat/vLB/base_vlb.yaml
index ad83f3cb..4e1459b5 100644
--- a/heat/vLB/base_vlb.yaml
+++ b/heat/vLB/base_vlb.yaml
@@ -149,10 +149,6 @@ parameters:
type: string
label: Public key
description: Public key to be installed on the compute instance
- repo_url_blob:
- type: string
- label: Repository URL
- description: URL of the repository that hosts the demo packages
repo_url_artifacts:
type: string
label: Repository URL
@@ -161,6 +157,10 @@ parameters:
type: string
label: Artifacts version used in demo vnfs
description: Artifacts (jar, tar.gz) version used in demo vnfs
+ nexus_artifact_repo:
+ type: string
+ description: Root URL for the Nexus repository for Maven artifacts.
+ default: "https://nexus.onap.org"
install_script_version:
type: string
label: Installation script version number
@@ -262,7 +262,6 @@ resources:
__gre_ipaddr__: { get_param: gre_ipaddr }
__pktgen_ipaddr__: { get_param: vpg_private_ip_0 }
__oam_private_ipaddr__: { get_param: vlb_private_ip_1 }
- __repo_url_blob__: { get_param: repo_url_blob }
__repo_url_artifacts__: { get_param: repo_url_artifacts }
__demo_artifacts_version__: { get_param: demo_artifacts_version }
__install_script_version__: { get_param: install_script_version }
@@ -284,7 +283,6 @@ resources:
echo "__gre_ipaddr__" > /opt/config/gre_ipaddr.txt
echo "__pktgen_ipaddr__" > /opt/config/pktgen_ipaddr.txt
echo "__oam_private_ipaddr__" > /opt/config/oam_private_ipaddr.txt
- echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt
echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
echo "__install_script_version__" > /opt/config/install_script_version.txt
@@ -295,7 +293,10 @@ resources:
echo "__cloud_env__" > /opt/config/cloud_env.txt
# Download and run install script
- curl -k __repo_url_blob__/org.onap.demo/vnfs/vlb/__install_script_version__/v_lb_install.sh -o /opt/v_lb_install.sh
+ apt-get -y install unzip
+ if [[ "__install_script_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vlb&a=vlb-scripts&e=zip&v=__install_script_version__" -o /opt/vlb-scripts-__install_script_version__.zip
+ unzip -j /opt/vlb-scripts-__install_script_version__.zip -d /opt v_lb_install.sh
cd /opt
chmod +x v_lb_install.sh
./v_lb_install.sh
@@ -333,7 +334,6 @@ resources:
__lb_private_ipaddr__: { get_param: vlb_private_ip_0 }
__local_private_ipaddr__: { get_param: vdns_private_ip_0 }
__oam_private_ipaddr__: { get_param: vdns_private_ip_1 }
- __repo_url_blob__: { get_param: repo_url_blob }
__repo_url_artifacts__: { get_param: repo_url_artifacts }
__demo_artifacts_version__: { get_param: demo_artifacts_version }
__install_script_version__: { get_param: install_script_version }
@@ -349,7 +349,6 @@ resources:
echo "__lb_private_ipaddr__" > /opt/config/lb_private_ipaddr.txt
echo "__local_private_ipaddr__" > /opt/config/local_private_ipaddr.txt
echo "__oam_private_ipaddr__" > /opt/config/oam_private_ipaddr.txt
- echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt
echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
echo "__install_script_version__" > /opt/config/install_script_version.txt
@@ -358,7 +357,10 @@ resources:
echo "__cloud_env__" > /opt/config/cloud_env.txt
# Download and run install script
- curl -k __repo_url_blob__/org.onap.demo/vnfs/vlb/__install_script_version__/v_dns_install.sh -o /opt/v_dns_install.sh
+ apt-get -y install unzip
+ if [[ "__install_script_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vlb&a=vlb-scripts&e=zip&v=__install_script_version__" -o /opt/vlb-scripts-__install_script_version__.zip
+ unzip -j /opt/vlb-scripts-__install_script_version__.zip -d /opt v_dns_install.sh
cd /opt
chmod +x v_dns_install.sh
./v_dns_install.sh
@@ -391,7 +393,6 @@ resources:
user_data:
str_replace:
params:
- __repo_url_blob__: { get_param: repo_url_blob }
__repo_url_artifacts__: { get_param: repo_url_artifacts }
__local_private_ipaddr__: { get_param: vpg_private_ip_0 }
__oam_private_ipaddr__: { get_param: vpg_private_ip_1 }
@@ -413,7 +414,6 @@ resources:
echo "__local_private_ipaddr__" > /opt/config/local_private_ipaddr.txt
echo "__pktgen_private_net_cidr__" > /opt/config/pktgen_private_net_cidr.txt
echo "__vlb_ipaddr__" > /opt/config/vlb_ipaddr.txt
- echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt
echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
echo "__install_script_version__" > /opt/config/install_script_version.txt
@@ -422,7 +422,10 @@ resources:
echo "__cloud_env__" > /opt/config/cloud_env.txt
# Download and run install script
- curl -k __repo_url_blob__/org.onap.demo/vnfs/vlb/__install_script_version__/v_packetgen_install.sh -o /opt/v_packetgen_install.sh
+ apt-get -y install unzip
+ if [[ "__install_script_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vlb&a=vlb-scripts&e=zip&v=__install_script_version__" -o /opt/vlb-scripts-__install_script_version__.zip
+ unzip -j /opt/vlb-scripts-__install_script_version__.zip -d /opt v_packetgen_install.sh
cd /opt
chmod +x v_packetgen_install.sh
./v_packetgen_install.sh \ No newline at end of file
diff --git a/heat/vLB/dnsscaling.env b/heat/vLB/dnsscaling.env
index ad61f22e..130bad38 100644
--- a/heat/vLB/dnsscaling.env
+++ b/heat/vLB/dnsscaling.env
@@ -14,10 +14,9 @@ parameters:
vdns_name_0: zdfw1lb01dns02
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/repositories/releases
demo_artifacts_version: 1.3.0-SNAPSHOT
- install_script_version: 1.2.1
+ install_script_version: 1.3.0-SNAPSHOT
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/vLB/dnsscaling.yaml b/heat/vLB/dnsscaling.yaml
index 759e6aeb..fd1833cc 100644
--- a/heat/vLB/dnsscaling.yaml
+++ b/heat/vLB/dnsscaling.yaml
@@ -101,10 +101,6 @@ parameters:
type: string
label: Public key
description: Public key to be installed on the compute instance
- repo_url_blob:
- type: string
- label: Repository URL
- description: URL of the repository that hosts the demo packages
repo_url_artifacts:
type: string
label: Repository URL
@@ -117,6 +113,10 @@ parameters:
type: string
label: Artifacts version used in demo vnfs
description: Artifacts (jar, tar.gz) version used in demo vnfs
+ nexus_artifact_repo:
+ type: string
+ description: Root URL for the Nexus repository for Maven artifacts.
+ default: "https://nexus.onap.org"
cloud_env:
type: string
label: Cloud environment
@@ -179,7 +179,6 @@ resources:
__lb_private_ipaddr__: { get_param: vlb_private_ip_0 }
__local_private_ipaddr__: { get_param: vdns_private_ip_0 }
__oam_private_ipaddr__: { get_param: vdns_private_ip_1 }
- __repo_url_blob__: { get_param: repo_url_blob }
__repo_url_artifacts__: { get_param: repo_url_artifacts }
__demo_artifacts_version__: { get_param: demo_artifacts_version }
__install_script_version__: { get_param: install_script_version }
@@ -195,7 +194,6 @@ resources:
echo "__lb_private_ipaddr__" > /opt/config/lb_private_ipaddr.txt
echo "__local_private_ipaddr__" > /opt/config/local_private_ipaddr.txt
echo "__oam_private_ipaddr__" > /opt/config/oam_private_ipaddr.txt
- echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt
echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
echo "__install_script_version__" > /opt/config/install_script_version.txt
@@ -204,7 +202,10 @@ resources:
echo "__cloud_env__" > /opt/config/cloud_env.txt
# Download and run install script
- curl -k __repo_url_blob__/org.onap.demo/vnfs/vlb/__install_script_version__/v_dns_install.sh -o /opt/v_dns_install.sh
+ apt-get -y install unzip
+ if [[ "__install_script_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vlb&a=vlb-scripts&e=zip&v=__install_script_version__" -o /opt/vlb-scripts-__install_script_version__.zip
+ unzip -j /opt/vlb-scripts-__install_script_version__.zip -d /opt v_dns_install.sh
cd /opt
chmod +x v_dns_install.sh
./v_dns_install.sh \ No newline at end of file
diff --git a/heat/vLBMS/base_vlb.env b/heat/vLBMS/base_vlb.env
index a447bc20..32b88474 100644
--- a/heat/vLBMS/base_vlb.env
+++ b/heat/vLBMS/base_vlb.env
@@ -26,11 +26,10 @@ parameters:
vf_module_id: vLoadBalancer
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
nb_api_version: 1.2.0
demo_artifacts_version: 1.3.0
- install_script_version: 1.2.1
+ install_script_version: 1.3.0-SNAPSHOT
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/base_vlb.yaml b/heat/vLBMS/base_vlb.yaml
index 44602a21..a323f23a 100644
--- a/heat/vLBMS/base_vlb.yaml
+++ b/heat/vLBMS/base_vlb.yaml
@@ -149,10 +149,6 @@ parameters:
type: string
label: Public key
description: Public key to be installed on the compute instance
- repo_url_blob:
- type: string
- label: Repository URL
- description: URL of the repository that hosts the demo packages
repo_url_artifacts:
type: string
label: Repository URL
@@ -269,7 +265,6 @@ resources:
__pktgen_ipaddr__: { get_param: vpg_private_ip_0 }
__vdns_ipaddr__: { get_param: vdns_private_ip_0 }
__oam_private_ipaddr__: { get_param: vlb_private_ip_1 }
- __repo_url_blob__: { get_param: repo_url_blob }
__repo_url_artifacts__: { get_param: repo_url_artifacts }
__demo_artifacts_version__: { get_param: demo_artifacts_version }
__nb_api_version__: { get_param: nb_api_version }
@@ -295,7 +290,6 @@ resources:
echo "__pktgen_ipaddr__" > /opt/config/pktgen_ipaddr.txt
echo "__vdns_ipaddr__" > /opt/config/vdns_ipaddr.txt
echo "__oam_private_ipaddr__" > /opt/config/oam_private_ipaddr.txt
- echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt
echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
echo "__nb_api_version__" > /opt/config/nb_api_version.txt
@@ -307,7 +301,10 @@ resources:
echo "__cloud_env__" > /opt/config/cloud_env.txt
# Download and run install script
- curl -k __repo_url_blob__/org.onap.demo/vnfs/vlbms/__install_script_version__/v_lb_install.sh -o /opt/v_lb_install.sh
+ apt-get -y install unzip
+ if [[ "__install_script_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vlbms&a=vlbms-scripts&e=zip&v=__install_script_version__" -o /opt/vlbms-scripts-__install_script_version__.zip
+ unzip -j /opt/vlbms-scripts-__install_script_version__.zip -d /opt v_lb_install.sh
cd /opt
chmod +x v_lb_install.sh
./v_lb_install.sh
@@ -346,7 +343,6 @@ resources:
__lb_to_pktgen_if__: { get_param: vlb_private_ip_2}
__local_private_ipaddr__: { get_param: vdns_private_ip_0 }
__oam_private_ipaddr__: { get_param: vdns_private_ip_1 }
- __repo_url_blob__: { get_param: repo_url_blob }
__repo_url_artifacts__: { get_param: repo_url_artifacts }
__nb_api_version__: { get_param: nb_api_version }
__install_script_version__: { get_param: install_script_version }
@@ -363,7 +359,6 @@ resources:
echo "__lb_to_pktgen_if__" > /opt/config/lb_to_pktgen_if.txt
echo "__local_private_ipaddr__" > /opt/config/local_private_ipaddr.txt
echo "__oam_private_ipaddr__" > /opt/config/oam_private_ipaddr.txt
- echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt
echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
echo "__nb_api_version__" > /opt/config/nb_api_version.txt
echo "__install_script_version__" > /opt/config/install_script_version.txt
@@ -372,7 +367,10 @@ resources:
echo "__cloud_env__" > /opt/config/cloud_env.txt
# Download and run install script
- curl -k __repo_url_blob__/org.onap.demo/vnfs/vlbms/__install_script_version__/v_dns_install.sh -o /opt/v_dns_install.sh
+ apt-get -y install unzip
+ if [[ "__install_script_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vlbms&a=vlbms-scripts&e=zip&v=__install_script_version__" -o /opt/vlbms-scripts-__install_script_version__.zip
+ unzip -j /opt/vlbms-scripts-__install_script_version__.zip -d /opt v_dns_install.sh
cd /opt
chmod +x v_dns_install.sh
./v_dns_install.sh
@@ -405,7 +403,6 @@ resources:
user_data:
str_replace:
params:
- __repo_url_blob__: { get_param: repo_url_blob }
__repo_url_artifacts__: { get_param: repo_url_artifacts }
__local_private_ipaddr__: { get_param: vpg_private_ip_0 }
__oam_private_ipaddr__: { get_param: vpg_private_ip_1 }
@@ -428,7 +425,6 @@ resources:
echo "__local_private_ipaddr__" > /opt/config/local_private_ipaddr.txt
echo "__pktgen_private_net_cidr__" > /opt/config/pktgen_private_net_cidr.txt
echo "__vlb_ipaddr__" > /opt/config/vlb_ipaddr.txt
- echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt
echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
echo "__nb_api_version__" > /opt/config/nb_api_version.txt
@@ -438,7 +434,10 @@ resources:
echo "__cloud_env__" > /opt/config/cloud_env.txt
# Download and run install script
- curl -k __repo_url_blob__/org.onap.demo/vnfs/vlbms/__install_script_version__/v_packetgen_install.sh -o /opt/v_packetgen_install.sh
+ apt-get -y install unzip
+ if [[ "__install_script_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vlbms&a=vlbms-scripts&e=zip&v=__install_script_version__" -o /opt/vlbms-scripts-__install_script_version__.zip
+ unzip -j /opt/vlbms-scripts-__install_script_version__.zip -d /opt v_packetgen_install.sh
cd /opt
chmod +x v_packetgen_install.sh
./v_packetgen_install.sh \ No newline at end of file
diff --git a/heat/vLBMS/dnsscaling.env b/heat/vLBMS/dnsscaling.env
index 996b6811..6706b7ec 100644
--- a/heat/vLBMS/dnsscaling.env
+++ b/heat/vLBMS/dnsscaling.env
@@ -15,11 +15,10 @@ parameters:
vdns_name_0: zdfw1lb01dns02
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
nb_api_version: 1.2.0
demo_artifacts_version: 1.3.0
- install_script_version: 1.2.1
+ install_script_version: 1.3.0-SNAPSHOT
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
diff --git a/heat/vLBMS/dnsscaling.yaml b/heat/vLBMS/dnsscaling.yaml
index a6ba45a1..c1cc3e7d 100644
--- a/heat/vLBMS/dnsscaling.yaml
+++ b/heat/vLBMS/dnsscaling.yaml
@@ -105,10 +105,6 @@ parameters:
type: string
label: Public key
description: Public key to be installed on the compute instance
- repo_url_blob:
- type: string
- label: Repository URL
- description: URL of the repository that hosts the demo packages
repo_url_artifacts:
type: string
label: Repository URL
@@ -184,7 +180,6 @@ resources:
__lb_to_pktgen_if__: { get_param: vlb_private_ip_2}
__local_private_ipaddr__: { get_param: vdns_private_ip_0 }
__oam_private_ipaddr__: { get_param: vdns_private_ip_1 }
- __repo_url_blob__: { get_param: repo_url_blob }
__repo_url_artifacts__: { get_param: repo_url_artifacts }
__nb_api_version__: { get_param: nb_api_version }
__install_script_version__: { get_param: install_script_version }
@@ -201,7 +196,6 @@ resources:
echo "__lb_to_pktgen_if__" > /opt/config/lb_to_pktgen_if.txt
echo "__local_private_ipaddr__" > /opt/config/local_private_ipaddr.txt
echo "__oam_private_ipaddr__" > /opt/config/oam_private_ipaddr.txt
- echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt
echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
echo "__nb_api_version__" > /opt/config/nb_api_version.txt
echo "__install_script_version__" > /opt/config/install_script_version.txt
@@ -210,7 +204,10 @@ resources:
echo "__cloud_env__" > /opt/config/cloud_env.txt
# Download and run install script
- curl -k __repo_url_blob__/org.onap.demo/vnfs/vlbms/__install_script_version__/v_dns_install.sh -o /opt/v_dns_install.sh
+ apt-get -y install unzip
+ if [[ "__install_script_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vlbms&a=vlbms-scripts&e=zip&v=__install_script_version__" -o /opt/vlbms-scripts-__install_script_version__.zip
+ unzip -j /opt/vlbms-scripts-__install_script_version__.zip -d /opt v_dns_install.sh
cd /opt
chmod +x v_dns_install.sh
./v_dns_install.sh \ No newline at end of file