aboutsummaryrefslogtreecommitdiffstats
path: root/heat/vCPE/vgmux
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-07-19 11:49:29 -0700
committerGary Wu <gary.i.wu@huawei.com>2018-07-19 11:55:07 -0700
commitd647840046966047386022ea862081fda35988c8 (patch)
tree27fe485ecfa2532db45a53d0344e359316ac9b42 /heat/vCPE/vgmux
parentd8843f2025ef00356ba8d0aab4daae996488399a (diff)
Deprecate use of sites/raw for vnf HEAT templates
Replace the use of sites/raw in vnf HEAT templates with zipped script artifacts Change-Id: I93c331c0f4753e8bf661e5a577463ab38bd116f5 Issue-ID: INT-592 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
Diffstat (limited to 'heat/vCPE/vgmux')
-rw-r--r--heat/vCPE/vgmux/base_vcpe_vgmux.env3
-rw-r--r--heat/vCPE/vgmux/base_vcpe_vgmux.yaml15
2 files changed, 9 insertions, 9 deletions
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