From: Marco Platania Date: Mon, 13 Aug 2018 21:19:14 +0000 (+0000) Subject: Merge "Update VBRG, vBNG compatibility w/ prev templates" X-Git-Tag: 1.3.0~71 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=27df8f3b5a676c6fa28fdc9675fd854d2f873220;hp=254597707b2573118680c569c1c748d3cca2af74;p=demo.git Merge "Update VBRG, vBNG compatibility w/ prev templates" --- 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" ############# # # 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" ############# # #