diff options
author | Mariah Jacobs <mariah.jacobs@intel.com> | 2018-08-13 06:36:00 -0700 |
---|---|---|
committer | Mariah Jacobs <mariah.jacobs@intel.com> | 2018-08-13 06:47:04 -0700 |
commit | ab85ff6066726a26c4fc02f46110a46070d636e3 (patch) | |
tree | d3f116c7fba00af9fbbeb26bdcb361ccc4ef1d54 /heat/vCPE/vbrgemu | |
parent | abaa8ecf29b2b93f25d8cd369ba0f333f367de04 (diff) |
Update VBRG, vBNG compatibility w/ prev templates
The VNF heat templates and environment files for the Casablanca release
provide backwards compatibility with previous releases. In the build
heat template of each VNF, the compile_state parameter is included
with a default state of ‘done’ specified.
This change removes the compile_state parameter from .env and .yaml files
where it was not necessary in order to maintain consistency with the way
that backwards compatibility is provided in vG-MUX and vGW templates.
Issue-ID: INT-615
Change-Id: I6317f20a94c374d30edc019dfe36f0c28bca4830
Signed-off-by: Mariah Jacobs <mariah.jacobs@intel.com>
Diffstat (limited to 'heat/vCPE/vbrgemu')
-rw-r--r-- | heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env | 1 | ||||
-rw-r--r-- | heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml | 6 | ||||
-rw-r--r-- | heat/vCPE/vbrgemu/build_vcpe_vbrgemu.env | 1 | ||||
-rw-r--r-- | heat/vCPE/vbrgemu/build_vcpe_vbrgemu.yaml | 1 |
4 files changed, 1 insertions, 8 deletions
diff --git a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env index ce29647b..41b5bfcf 100644 --- a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env +++ b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env @@ -1,7 +1,6 @@ parameters: vcpe_image_name: PUT THE IMAGE NAME HERE (Ubuntu 1604 or vbrg-base-ubuntu-16-04 SUGGESTED) vcpe_flavor_name: PUT THE FLAVOR NAME HERE (MEDIUM FLAVOR SUGGESTED) - compile_state: done public_net_id: PUT THE PUBLIC NETWORK ID HERE vbrgemu_bng_private_net_id: zdfw1bngin01_private vbrgemu_bng_private_subnet_id: zdfw1bngin01_sub_private diff --git a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml index 22970344..e0b6da49 100644 --- a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml +++ b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml @@ -120,10 +120,6 @@ parameters: type: string label: SDNC ip address description: SDNC ip address used to set NAT - compile_state: - type: string - label: Compile State - description: State to compile code or not; included for backwards compatibility ############# # # @@ -201,7 +197,6 @@ resources: __script_version__ : { get_param: script_version } __cloud_env__ : { get_param: cloud_env } __sdnc_ip__ : { get_param: sdnc_ip } - __compile_state__ : { get_param: compile_state } __nexus_artifact_repo__: { get_param: nexus_artifact_repo } template: | #!/bin/bash @@ -216,7 +211,6 @@ resources: echo "__script_version__" > /opt/config/script_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__sdnc_ip__" > /opt/config/sdnc_ip.txt - echo "__compile_state__" > /opt/config/compile_state.txt echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt # Download and run install script diff --git a/heat/vCPE/vbrgemu/build_vcpe_vbrgemu.env b/heat/vCPE/vbrgemu/build_vcpe_vbrgemu.env index 4c9ae439..15035a64 100644 --- a/heat/vCPE/vbrgemu/build_vcpe_vbrgemu.env +++ b/heat/vCPE/vbrgemu/build_vcpe_vbrgemu.env @@ -1,7 +1,6 @@ parameters: vcpe_image_name: PUT THE IMAGE NAME HERE (Ubuntu 1604 or vbrg-base-ubuntu-16-04 SUGGESTED) vcpe_flavor_name: PUT THE FLAVOR NAME HERE (MEDIUM FLAVOR SUGGESTED) - compile_state: build vbrgemu_name_0: zdcpe1cpe01brgemu01 vnf_id: vCPE_Infrastructure_BGREMU_demo_app vf_module_id: vCPE_Customer_BRGEMU diff --git a/heat/vCPE/vbrgemu/build_vcpe_vbrgemu.yaml b/heat/vCPE/vbrgemu/build_vcpe_vbrgemu.yaml index c5a3332e..e176747f 100644 --- a/heat/vCPE/vbrgemu/build_vcpe_vbrgemu.yaml +++ b/heat/vCPE/vbrgemu/build_vcpe_vbrgemu.yaml @@ -111,6 +111,7 @@ parameters: type: string label: Compile State description: State to compile code or not; included for backwards compatibility + default: "done" ############# # # |