X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FvCPE%2Fvbng%2Fbase_vcpe_vbng.yaml;h=e6a71343e6aeb2d480fb6c4dcc19c4218cd9df40;hb=314c0c1e45bc6a4c1ae0e7c030ebbf51b80abb35;hp=997e4c23137e8f597d74990a60163511e7406e81;hpb=248e0fb8c855fcbde71b5e69e53aae6fbd8956f5;p=demo.git diff --git a/heat/vCPE/vbng/base_vcpe_vbng.yaml b/heat/vCPE/vbng/base_vcpe_vbng.yaml index 997e4c23..e6a71343 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_artifacts: - type: string - label: Repository URL - description: URL of the repository that hosts the demo packages script_version: type: string label: Installation script version number @@ -161,10 +157,6 @@ parameters: type: string label: SDNC IP address description: IP address of the SDNC - compile_state: - type: string - label: Compile State - description: State to compile code or not; included for backwards compatibility ############# # # @@ -245,12 +237,10 @@ 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_artifacts__ : { get_param: repo_url_artifacts } - __demo_artifacts_version__ : { get_param: demo_artifacts_version } - __script_version__ : { get_param: script_version } - __cloud_env__ : { get_param: cloud_env } + __demo_artifacts_version__: { get_param: demo_artifacts_version } + __script_version__: { get_param: script_version } + __cloud_env__: { get_param: cloud_env } __sdnc_ip_addr__: { get_param: sdnc_ip_addr } - __compile_state__ : { get_param: compile_state } __nexus_artifact_repo__: { get_param: nexus_artifact_repo } template: | #!/bin/bash @@ -267,15 +257,14 @@ 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_artifacts__" > /opt/config/repo_url_artifacts.txt echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt echo "__script_version__" > /opt/config/script_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt - echo "__compile_state__" > /opt/config/compile_state.txt echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt # Download and run install script + apt-get update apt-get -y install unzip if [[ "__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=__script_version__" -o /opt/vcpe-scripts-__script_version__.zip