diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-07-19 11:49:29 -0700 |
|---|---|---|
| committer | Gary Wu <gary.i.wu@huawei.com> | 2018-07-19 11:55:07 -0700 |
| commit | d647840046966047386022ea862081fda35988c8 (patch) | |
| tree | 27fe485ecfa2532db45a53d0344e359316ac9b42 /heat/vLB/dnsscaling.yaml | |
| parent | d8843f2025ef00356ba8d0aab4daae996488399a (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/vLB/dnsscaling.yaml')
| -rw-r--r-- | heat/vLB/dnsscaling.yaml | 15 |
1 files changed, 8 insertions, 7 deletions
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 |