X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FvCPE%2Fvbrgemu%2Fbase_vcpe_vbrgemu.yaml;fp=heat%2FvCPE%2Fvbrgemu%2Fbase_vcpe_vbrgemu.yaml;h=8a737ebfd5dc5a5c1f64fe748ed83e52dda42163;hb=d647840046966047386022ea862081fda35988c8;hp=52941794a2d88f3f5476aa245e3bb9bc8ca53edc;hpb=d8843f2025ef00356ba8d0aab4daae996488399a;p=demo.git 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