diff options
author | 2018-08-07 10:16:39 -0700 | |
---|---|---|
committer | 2018-08-07 10:16:50 -0700 | |
commit | 654fdf0c807e436d59b160e0bc9100e7af35eba8 (patch) | |
tree | 31cb7e9cf905721625f45b64ab12954189d41ccf /heat/vCPE/vgmux/base_vcpe_vgmux.yaml | |
parent | 42776053a7a321742ae9070d07e880969ad2bfb8 (diff) |
Refactor vCPE vG-MUX and vG image creation process
Separate heat/env templates and build scripts have been created for vG-MUX and vG
The build logic and parameters are removed from the install scripts and
the base heat/env files used to deploy the VMs.
For backwards compatibility, the compile_state parameter was added to both VMs.
Small corrections were made to the heat templates for clarity.
Issue-ID: INT-615
Change-Id: I3180654f959776ebd4706613e00b9faff3f72e9e
Signed-off-by: Praneta Paithankar <praneta.paithankar@intel.com>
Diffstat (limited to 'heat/vCPE/vgmux/base_vcpe_vgmux.yaml')
-rw-r--r-- | heat/vCPE/vgmux/base_vcpe_vgmux.yaml | 71 |
1 files changed, 9 insertions, 62 deletions
diff --git a/heat/vCPE/vgmux/base_vcpe_vgmux.yaml b/heat/vCPE/vgmux/base_vcpe_vgmux.yaml index 65130438..220c88fc 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 ############## # # @@ -129,18 +129,10 @@ 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 - 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: - type: string - label: Artifacts version used in demo vnfs - description: Artifacts (jar, tar.gz) version used in demo vnfs + description: Version number of the scripts that install the vGMUX nexus_artifact_repo: type: string description: Root URL for the Nexus repository for Maven artifacts. @@ -149,34 +141,6 @@ parameters: 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_release_tag: - type: string - label: VPP Source Git Release Tag - description: Git Tag 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_release_tag: - type: string - label: Honeycomb Source Git Release Tag - description: Git Tag 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 ############# # # @@ -248,17 +212,8 @@ 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_artifacts__ : { get_param: repo_url_artifacts } - __demo_artifacts_version__ : { get_param: demo_artifacts_version } - __install_script_version__ : { get_param: install_script_version } + __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_release_tag__ : { get_param: vpp_source_repo_release_tag } - __hc2vpp_source_repo_url__ : { get_param: hc2vpp_source_repo_url } - __hc2vpp_source_repo_release_tag__ : { get_param: hc2vpp_source_repo_release_tag } - __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 @@ -273,24 +228,16 @@ 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_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 "__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_release_tag__" > /opt/config/vpp_source_repo_release_tag.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_release_tag__" > /opt/config/hc2vpp_source_repo_release_tag.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 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 + 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 + sudo su - cd /opt chmod +x v_gmux_install.sh ./v_gmux_install.sh |