X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FvCPE%2Fvgmux%2Fbase_vcpe_vgmux.yaml;h=2bbf65c7739366a9b94896b09c06824525225b38;hb=27843af28b44f580d06325d45de8320008b43796;hp=ecdb1b1b413dc6d4b23b5c5765dd792a08a67d1a;hpb=02977bf425c1e2039174065502f385a135caa5ee;p=demo.git diff --git a/heat/vCPE/vgmux/base_vcpe_vgmux.yaml b/heat/vCPE/vgmux/base_vcpe_vgmux.yaml index ecdb1b1b..2bbf65c7 100644 --- a/heat/vCPE/vgmux/base_vcpe_vgmux.yaml +++ b/heat/vCPE/vgmux/base_vcpe_vgmux.yaml @@ -24,7 +24,7 @@ heat_template_version: 2013-05-23 -description: Heat template to deploy vCPE Infrastructue Metro vGMUX +description: Heat template to build vCPE Infrastructue Metro vGMUX ############## # # @@ -69,6 +69,10 @@ parameters: type: string label: vGMUX private network CIDR description: The CIDR of the vGMUX private network + brgemu_bng_private_net_cidr: + type: string + label: vBRG vBNG private network CIDR + description: The CIDR of the vBRG-vBNG private network onap_private_net_id: type: string label: ONAP management network name or ID @@ -105,6 +109,10 @@ parameters: type: string label: vCPE module ID description: The vCPE Module ID is provided by ONAP + bng_gmux_private_ip: + type: string + label: vBNG private IP address towards the vBNG-vGMUX private network + description: Private IP address that is assigned to the vBNG to communicate with the vGMUX dcae_collector_ip: type: string label: DCAE collector IP address @@ -121,54 +129,18 @@ 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 - description: URL of the repository that hosts the demo packages - install_script_version: + script_version: type: string label: Installation script version number - description: Version number of the scripts that install the vFW demo app - demo_artifacts_version: + description: Version number of the scripts that install the vGMUX + nexus_artifact_repo: type: string - label: Artifacts version used in demo vnfs - description: Artifacts (jar, tar.gz) version used in demo vnfs + description: Root URL for the Nexus repository for Maven artifacts. + default: "https://nexus.onap.org" cloud_env: type: string label: Cloud environment description: Cloud environment (e.g., openstack, rackspace) - vpp_source_repo_url: - type: string - label: VPP Source Git Repo - description: URL for VPP source codes - vpp_source_repo_branch: - type: string - label: VPP Source Git Branch - description: Git Branch for the VPP source codes - hc2vpp_source_repo_url: - type: string - label: Honeycomb Source Git Repo - description: URL for Honeycomb source codes - hc2vpp_source_repo_branch: - type: string - label: Honeycomb Source Git Branch - description: Git Branch for the Honeycomb source codes - vpp_patch_url: - type: string - label: VPP Patch URL - description: URL for VPP patch for vG-MUX - hc2vpp_patch_url: - type: string - label: Honeycomb Patch URL - description: URL for Honeycomb patch for vG-MUX - libevel_patch_url: - type: string - label: libevel Patch URL - description: URL for libevel patch for vG-MUX ############# # # @@ -232,50 +204,39 @@ resources: user_data: str_replace: params: - __bng_mux_net_ipaddr__ : { get_param: vgmux_private_ip_0 } + __mux_to_bng_net_ipaddr__ : { get_param: vgmux_private_ip_0 } __oam_ipaddr__ : { get_param: vgmux_private_ip_1 } __mux_gw_net_ipaddr__ : { get_param: vgmux_private_ip_2 } + __bng_to_mux_ipaddr__ : { get_param: bng_gmux_private_ip } __bng_mux_net_cidr__ : { get_param: bng_gmux_private_net_cidr } __oam_cidr__ : { get_param: onap_private_net_cidr } __mux_gw_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 } + __brg_bng_net_cidr__ : { get_param: brgemu_bng_private_net_cidr } + __script_version__ : { get_param: script_version } __cloud_env__ : { get_param: cloud_env } - __vpp_source_repo_url__ : { get_param: vpp_source_repo_url } - __vpp_source_repo_branch__ : { get_param: vpp_source_repo_branch } - __hc2vpp_source_repo_url__ : { get_param: hc2vpp_source_repo_url } - __hc2vpp_source_repo_branch__ : { get_param: hc2vpp_source_repo_branch } - __vpp_patch_url__ : { get_param: vpp_patch_url } - __hc2vpp_patch_url__ : { get_param: hc2vpp_patch_url } - __libevel_patch_url__ : { get_param: libevel_patch_url } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } template: | #!/bin/bash # Create configuration files mkdir /opt/config - echo "__bng_mux_net_ipaddr__" > /opt/config/bng_mux_net_ipaddr.txt + echo "__mux_to_bng_net_ipaddr__" > /opt/config/mux_to_bng_net_ipaddr.txt echo "__oam_ipaddr__" > /opt/config/oam_ipaddr.txt echo "__mux_gw_net_ipaddr__" > /opt/config/mux_gw_net_ipaddr.txt + echo "__bng_to_mux_ipaddr__ " > /opt/config/bng_to_mux_net_ipaddr.txt echo "__bng_mux_net_cidr__" > /opt/config/bng_mux_net_cidr.txt echo "__oam_cidr__" > /opt/config/oam_cidr.txt echo "__mux_gw_net_cidr__" > /opt/config/mux_gw_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 "__brg_bng_net_cidr__" > /opt/config/brg_bng_net_cidr.txt + echo "__script_version__" > /opt/config/script_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt - echo "__vpp_source_repo_url__" > /opt/config/vpp_source_repo_url.txt - echo "__vpp_source_repo_branch__" > /opt/config/vpp_source_repo_branch.txt - echo "__vpp_patch_url__" > /opt/config/vpp_patch_url.txt - echo "__hc2vpp_source_repo_url__" > /opt/config/hc2vpp_source_repo_url.txt - echo "__hc2vpp_source_repo_branch__" > /opt/config/hc2vpp_source_repo_branch.txt - echo "__hc2vpp_patch_url__" > /opt/config/hc2vpp_patch_url.txt - echo "__libevel_patch_url__" > /opt/config/libevel_patch_url.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.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 [[ "__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 + unzip -j /opt/vcpe-scripts-__script_version__.zip -d /opt v_gmux_install.sh cd /opt chmod +x v_gmux_install.sh ./v_gmux_install.sh