diff options
| author |   Marco Platania <platania@research.att.com> | 2018-08-13 21:19:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-08-13 21:19:14 +0000 |
| commit | 27df8f3b5a676c6fa28fdc9675fd854d2f873220 (patch) | |
| tree | 289aecff3762bce25097f18477ca8a91b8d73b61 /heat/vCPE/vbng | |
| parent | 254597707b2573118680c569c1c748d3cca2af74 (diff) | |
| parent | ab85ff6066726a26c4fc02f46110a46070d636e3 (diff) | |
Merge "Update VBRG, vBNG compatibility w/ prev templates"
Diffstat (limited to 'heat/vCPE/vbng')
| -rw-r--r-- | heat/vCPE/vbng/base_vcpe_vbng.env | 1 | ||||
| -rw-r--r-- | heat/vCPE/vbng/base_vcpe_vbng.yaml | 6 | ||||
| -rw-r--r-- | heat/vCPE/vbng/build_vcpe_vbng.env | 1 | ||||
| -rw-r--r-- | heat/vCPE/vbng/build_vcpe_vbng.yaml | 1 |
4 files changed, 1 insertions, 8 deletions
diff --git a/heat/vCPE/vbng/base_vcpe_vbng.env b/heat/vCPE/vbng/base_vcpe_vbng.env index 6d860adb..a29fe632 100644 --- a/heat/vCPE/vbng/base_vcpe_vbng.env +++ b/heat/vCPE/vbng/base_vcpe_vbng.env @@ -1,7 +1,6 @@ parameters: vcpe_image_name: PUT THE IMAGE NAME HERE (Ubuntu 1604 SUGGESTED) vcpe_flavor_name: PUT THE FLAVOR NAME HERE (MEDIUM FLAVOR SUGGESTED) - compile_state: done public_net_id: PUT THE PUBLIC NETWORK ID HERE brgemu_bng_private_net_id: zdfw1bngin01_private brgemu_bng_private_subnet_id: zdfw1bngin01_sub_private diff --git a/heat/vCPE/vbng/base_vcpe_vbng.yaml b/heat/vCPE/vbng/base_vcpe_vbng.yaml index 997e4c23..fbdbf8f2 100644 --- a/heat/vCPE/vbng/base_vcpe_vbng.yaml +++ b/heat/vCPE/vbng/base_vcpe_vbng.yaml @@ -161,10 +161,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 ############# # # @@ -250,7 +246,6 @@ resources: __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 @@ -272,7 +267,6 @@ resources: 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 diff --git a/heat/vCPE/vbng/build_vcpe_vbng.env b/heat/vCPE/vbng/build_vcpe_vbng.env index b7e2de05..ba9a2c40 100644 --- a/heat/vCPE/vbng/build_vcpe_vbng.env +++ b/heat/vCPE/vbng/build_vcpe_vbng.env @@ -1,7 +1,6 @@ parameters: vcpe_image_name: PUT THE IMAGE NAME HERE (Ubuntu 1604 SUGGESTED) vcpe_flavor_name: PUT THE FLAVOR NAME HERE (MEDIUM FLAVOR SUGGESTED) - compile_state: build public_net_id: PUT THE PUBLIC NETWORK ID HERE vbng_name_0: zdcpe1cpe01bng01 vnf_id: vCPE_Infrastructure_Metro_vBNG_demo_app diff --git a/heat/vCPE/vbng/build_vcpe_vbng.yaml b/heat/vCPE/vbng/build_vcpe_vbng.yaml index eb623f8a..59cc2911 100644 --- a/heat/vCPE/vbng/build_vcpe_vbng.yaml +++ b/heat/vCPE/vbng/build_vcpe_vbng.yaml @@ -101,6 +101,7 @@ parameters: type: string label: Compile State description: State to compile code or not; included for backwards compatibility + default: "done" ############# # # |