From 97afbb12cae07c65d99bba56c6289b0e28e09462 Mon Sep 17 00:00:00 2001 From: Eric Multanen Date: Wed, 22 Aug 2018 17:48:27 -0700 Subject: vCPE - move build template files to own directory Move the new Heat and environment template files for building the vCPE images to a separate directory. Issue-ID: INT-620 Change-Id: Id437ec19c910a69928e1cedf7bb90565c520a773 Signed-off-by: Eric Multanen --- heat/vCPE/vbng/build_vcpe_vbng.env | 16 --- heat/vCPE/vbng/build_vcpe_vbng.yaml | 177 ------------------------- heat/vCPE/vbrgemu/build_vcpe_vbrgemu.env | 18 --- heat/vCPE/vbrgemu/build_vcpe_vbrgemu.yaml | 190 --------------------------- heat/vCPE/vgmux/build_vcpe_vgmux.env | 22 ---- heat/vCPE/vgmux/build_vcpe_vgmux.yaml | 211 ------------------------------ heat/vCPE/vgw/build_vcpe_vgw.env | 19 --- heat/vCPE/vgw/build_vcpe_vgw.yaml | 194 --------------------------- 8 files changed, 847 deletions(-) delete mode 100644 heat/vCPE/vbng/build_vcpe_vbng.env delete mode 100644 heat/vCPE/vbng/build_vcpe_vbng.yaml delete mode 100644 heat/vCPE/vbrgemu/build_vcpe_vbrgemu.env delete mode 100644 heat/vCPE/vbrgemu/build_vcpe_vbrgemu.yaml delete mode 100644 heat/vCPE/vgmux/build_vcpe_vgmux.env delete mode 100644 heat/vCPE/vgmux/build_vcpe_vgmux.yaml delete mode 100644 heat/vCPE/vgw/build_vcpe_vgw.env delete mode 100644 heat/vCPE/vgw/build_vcpe_vgw.yaml (limited to 'heat/vCPE') diff --git a/heat/vCPE/vbng/build_vcpe_vbng.env b/heat/vCPE/vbng/build_vcpe_vbng.env deleted file mode 100644 index ba9a2c40..00000000 --- a/heat/vCPE/vbng/build_vcpe_vbng.env +++ /dev/null @@ -1,16 +0,0 @@ - parameters: - vcpe_image_name: PUT THE IMAGE NAME HERE (Ubuntu 1604 SUGGESTED) - vcpe_flavor_name: PUT THE FLAVOR NAME HERE (MEDIUM FLAVOR SUGGESTED) - public_net_id: PUT THE PUBLIC NETWORK ID HERE - vbng_name_0: zdcpe1cpe01bng01 - vnf_id: vCPE_Infrastructure_Metro_vBNG_demo_app - vf_module_id: vCPE_Intrastructure_Metro_vBNG - repo_url_artifacts: https://nexus.onap.org/content/repositories/staging - demo_artifacts_version: 1.3.0 - script_version: 1.3.0-SNAPSHOT - key_name: vbng_key - pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN - cloud_env: PUT THE CLOUD PROVIDED HERE (openstack or rackspace) - vpp_source_repo_url: https://gerrit.fd.io/r/vpp - vpp_source_repo_release_tag: v17.04 - vpp_patch_url: https://git.onap.org/demo/plain/vnfs/vCPE/vpp-radius-client-for-vbng/src/patches/Vpp-Integrate-FreeRADIUS-Client-for-vBNG.patch diff --git a/heat/vCPE/vbng/build_vcpe_vbng.yaml b/heat/vCPE/vbng/build_vcpe_vbng.yaml deleted file mode 100644 index 59cc2911..00000000 --- a/heat/vCPE/vbng/build_vcpe_vbng.yaml +++ /dev/null @@ -1,177 +0,0 @@ -########################################################################## -# -#==================LICENSE_START========================================== -# -# -# Copyright 2017 AT&T Intellectual Property. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -#==================LICENSE_END============================================ -# -# ECOMP is a trademark and service mark of AT&T Intellectual Property. -# -########################################################################## - -heat_template_version: 2013-05-23 - -description: Heat template to build vCPE virtual Broadband Network Gateway (vBNG) - -############## -# # -# PARAMETERS # -# # -############## - -parameters: - vcpe_image_name: - type: string - label: Image name or ID - description: Image to be used for compute instance - vcpe_flavor_name: - type: string - label: Flavor - description: Type of instance (flavor) to be used - public_net_id: - type: string - label: Public network name or ID - description: Public network that enables remote connection to VNF - vbng_name_0: - type: string - label: vBNG name - description: Name of the vBNG - vnf_id: - type: string - label: VNF ID - description: The VNF ID is provided by ONAP - vf_module_id: - type: string - label: vCPE module ID - description: The vCPE Module ID is provided by ONAP - key_name: - type: string - label: Key pair name - description: Public/Private key pair name - pub_key: - 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 - script_version: - type: string - label: Build script version number - description: Version number of the scripts that build 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 - nexus_artifact_repo: - type: string - 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_release_tag: - type: string - label: VPP Source Git Release Tag - description: Git Release Tag for the VPP source codes - vpp_patch_url: - type: string - label: VPP Patch URL - description: URL for VPP patch for vBNG - compile_state: - type: string - label: Compile State - description: State to compile code or not; included for backwards compatibility - default: "done" - -############# -# # -# RESOURCES # -# # -############# - -resources: - - random-str: - type: OS::Heat::RandomString - properties: - length: 4 - - my_keypair: - type: OS::Nova::KeyPair - properties: - name: - str_replace: - template: base_rand - params: - base: { get_param: key_name } - rand: { get_resource: random-str } - public_key: { get_param: pub_key } - save_private_key: false - - - vbng_0: - type: OS::Nova::Server - properties: - image: { get_param: vcpe_image_name } - flavor: { get_param: vcpe_flavor_name } - name: { get_param: vbng_name_0 } - key_name: { get_resource: my_keypair } - networks: - - network: { get_param: public_net_id } - metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }} - user_data_format: RAW - user_data: - str_replace: - params: - __repo_url_artifacts__ : { get_param: repo_url_artifacts } - __demo_artifacts_version__ : { get_param: demo_artifacts_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 } - __vpp_patch_url__ : { get_param: vpp_patch_url } - __compile_state__ : { get_param: compile_state } - __nexus_artifact_repo__: { get_param: nexus_artifact_repo } - template: | - #!/bin/bash - - # Create configuration files - mkdir /opt/config - echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt - echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_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 "__compile_state__" > /opt/config/compile_state.txt - echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt - - # Download and run install script - 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_bng_build.sh - cd /opt - chmod +x v_bng_build.sh - ./v_bng_build.sh diff --git a/heat/vCPE/vbrgemu/build_vcpe_vbrgemu.env b/heat/vCPE/vbrgemu/build_vcpe_vbrgemu.env deleted file mode 100644 index be905dc8..00000000 --- a/heat/vCPE/vbrgemu/build_vcpe_vbrgemu.env +++ /dev/null @@ -1,18 +0,0 @@ - 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) - public_net_id: PUT THE PUBLIC NETWORK ID HERE - vbrgemu_name_0: zdcpe1cpe01brgemu01 - vnf_id: vCPE_Infrastructure_BGREMU_demo_app - vf_module_id: vCPE_Customer_BRGEMU - repo_url_artifacts: https://nexus.onap.org/content/repositories/staging - demo_artifacts_version: 1.3.0 - script_version: 1.3.0-SNAPSHOT - key_name: vbrgemu_key - pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh - cloud_env: PUT THE CLOUD PROVIDED HERE (openstack or rackspace) - vpp_source_repo_url: https://gerrit.fd.io/r/vpp - vpp_source_repo_release_tag: v17.04 - hc2vpp_source_repo_url: https://gerrit.fd.io/r/hc2vpp - hc2vpp_source_repo_release_tag: v1.17.04 - vpp_patch_url: https://git.onap.org/demo/plain/vnfs/vCPE/vpp-option-82-for-vbrg/src/patches/VPP-Add-Option82-Nat-Filter-For-vBRG.patch diff --git a/heat/vCPE/vbrgemu/build_vcpe_vbrgemu.yaml b/heat/vCPE/vbrgemu/build_vcpe_vbrgemu.yaml deleted file mode 100644 index e176747f..00000000 --- a/heat/vCPE/vbrgemu/build_vcpe_vbrgemu.yaml +++ /dev/null @@ -1,190 +0,0 @@ -########################################################################## -# -#==================LICENSE_START========================================== -# -# -# Copyright 2017 AT&T Intellectual Property. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -#==================LICENSE_END============================================ -# -# ECOMP is a trademark and service mark of AT&T Intellectual Property. -# -########################################################################## - -heat_template_version: 2013-05-23 - -description: Heat template to build vCPE vBRG Emulator (vBRGEMU) - -####################################################################### -# # -# PARAMETERS # -# # -# 0_port should get IP address from DHCP discover through vBNG # -# DCAE is not monitoring the BRGEMULATOR # -####################################################################### - -parameters: - vcpe_image_name: - type: string - label: Image name or ID - description: Image to be used for compute instance - vcpe_flavor_name: - type: string - label: Flavor - description: Type of instance (flavor) to be used - public_net_id: - type: string - label: Public network name or ID - description: Public network that enables remote connection to VNF - vbrgemu_name_0: - type: string - label: vBRG name - description: Name of the vBRG - vnf_id: - type: string - label: VNF ID - description: The VNF ID is provided by ONAP - vf_module_id: - type: string - label: vCPE module ID - description: The vCPE Module ID is provided by ONAP - key_name: - type: string - label: Key pair name - description: Public/Private key pair name - pub_key: - 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 - script_version: - type: string - label: Build script version number - description: Version number of the scripts that builds 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 - nexus_artifact_repo: - type: string - 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_release_tag: - type: string - label: VPP Source Git Release Tag - description: Git Release 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 Release Tag for the Honeycomb source codes - vpp_patch_url: - type: string - label: VPP Patch URL - description: URL for VPP patch for vBRG Emulator - compile_state: - type: string - label: Compile State - description: State to compile code or not; included for backwards compatibility - default: "done" - -############# -# # -# RESOURCES # -# # -############# - -resources: - - random-str: - type: OS::Heat::RandomString - properties: - length: 4 - - my_keypair: - type: OS::Nova::KeyPair - properties: - name: - str_replace: - template: base_rand - params: - base: { get_param: key_name } - rand: { get_resource: random-str } - public_key: { get_param: pub_key } - save_private_key: false - - vbrgemu_0: - type: OS::Nova::Server - properties: - image: { get_param: vcpe_image_name } - flavor: { get_param: vcpe_flavor_name } - name: { get_param: vbrgemu_name_0 } - key_name: { get_resource: my_keypair } - networks: - - network: { get_param: public_net_id } - metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }} - user_data_format: RAW - user_data: - str_replace: - params: - __repo_url_artifacts__ : { get_param: repo_url_artifacts } - __demo_artifacts_version__ : { get_param: demo_artifacts_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 } - __compile_state__ : { get_param: compile_state } - __nexus_artifact_repo__: { get_param: nexus_artifact_repo } - template: | - #!/bin/bash - - # Create configuration files - mkdir /opt/config - echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt - echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_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 "__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 "__vpp_patch_url__" > /opt/config/vpp_patch_url.txt - echo "__compile_state__" > /opt/config/compile_state.txt - echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt - - # Download and run install script - 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_brgemu_build.sh - cd /opt - chmod +x v_brgemu_build.sh - ./v_brgemu_build.sh diff --git a/heat/vCPE/vgmux/build_vcpe_vgmux.env b/heat/vCPE/vgmux/build_vcpe_vgmux.env deleted file mode 100644 index 47863acd..00000000 --- a/heat/vCPE/vgmux/build_vcpe_vgmux.env +++ /dev/null @@ -1,22 +0,0 @@ - parameters: - vcpe_image_name: PUT THE IMAGE NAME HERE (Ubuntu 1604 SUGGESTED) - vcpe_flavor_name: PUT THE FLAVOR NAME HERE (MEDIUM FLAVOR SUGGESTED) - public_net_id: PUT THE PUBLIC NETWORK ID HERE - vgmux_name_0: zdcpe1cpe01mux01 - vnf_id: vCPE_Infrastructure_vGMUX_demo_app - vf_module_id: vCPE_Intrastructure_Metro_vGMUX - dcae_collector_ip: 10.0.4.1 - dcae_collector_port: 8081 - repo_url_artifacts: https://nexus.onap.org/content/repositories/staging - demo_artifacts_version: 1.3.0 - script_version: 1.3.0-SNAPSHOT - key_name: vgmux_key - pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN - cloud_env: PUT THE CLOUD PROVIDED HERE (openstack or rackspace) - vpp_source_repo_url: https://gerrit.fd.io/r/vpp - vpp_source_repo_release_tag: v17.04 - hc2vpp_source_repo_url: https://gerrit.fd.io/r/hc2vpp - hc2vpp_source_repo_release_tag: v1.17.04 - vpp_patch_url: https://git.onap.org/demo/plain/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/Vpp-Add-VES-agent-for-vG-MUX.patch - hc2vpp_patch_url: https://git.onap.org/demo/plain/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/Hc2vpp-Add-VES-agent-for-vG-MUX.patch - libevel_patch_url: https://git.onap.org/demo/plain/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/vCPE-vG-MUX-libevel-fixup.patchme diff --git a/heat/vCPE/vgmux/build_vcpe_vgmux.yaml b/heat/vCPE/vgmux/build_vcpe_vgmux.yaml deleted file mode 100644 index f7d843d7..00000000 --- a/heat/vCPE/vgmux/build_vcpe_vgmux.yaml +++ /dev/null @@ -1,211 +0,0 @@ -########################################################################## -# -#==================LICENSE_START========================================== -# -# -# Copyright 2017 AT&T Intellectual Property. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -#==================LICENSE_END============================================ -# -# ECOMP is a trademark and service mark of AT&T Intellectual Property. -# -########################################################################## - -heat_template_version: 2013-05-23 - -description: Heat template to build vCPE Infrastructue Metro vGMUX - -############## -# # -# PARAMETERS # -# # -############## - -parameters: - vcpe_image_name: - type: string - label: Image name or ID - description: Image to be used for compute instance - vcpe_flavor_name: - type: string - label: Flavor - description: Type of instance (flavor) to be used - public_net_id: - type: string - label: Public network name or ID - description: Public network that enables remote connection to VNF - vgmux_name_0: - type: string - label: vGMUX name - description: Name of the vGMUX - vnf_id: - type: string - label: VNF ID - description: The VNF ID is provided by ONAP - vf_module_id: - type: string - label: vCPE module ID - description: The vCPE Module ID is provided by ONAP - dcae_collector_ip: - type: string - label: DCAE collector IP address - description: IP address of the DCAE collector - dcae_collector_port: - type: string - label: DCAE collector port - description: Port of the DCAE collector - key_name: - type: string - label: Key pair name - description: Public/Private key pair name - pub_key: - 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 - script_version: - type: string - label: Script version number - description: Version number of the scripts that build the vGMUX - demo_artifacts_version: - type: string - label: Artifacts version used in demo vnfs - description: Artifacts (jar, tar.gz) version used in demo vnfs - nexus_artifact_repo: - type: string - 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_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 - # Compile_state parameter is added to provide backward compatibility for Beijing and Amsterdam releases - compile_state: - type: string - label: Compile State - description: State to compile code or not - default: "done" - -############# -# # -# RESOURCES # -# # -############# - -resources: - - random-str: - type: OS::Heat::RandomString - properties: - length: 4 - - my_keypair: - type: OS::Nova::KeyPair - properties: - name: - str_replace: - template: base_rand - params: - base: { get_param: key_name } - rand: { get_resource: random-str } - public_key: { get_param: pub_key } - save_private_key: false - - - # Virtual GMUX Instantiation - vgmux_0: - type: OS::Nova::Server - properties: - image: { get_param: vcpe_image_name } - flavor: { get_param: vcpe_flavor_name } - name: { get_param: vgmux_name_0 } - key_name: { get_resource: my_keypair } - networks: - - network: { get_param: public_net_id } - metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }} - user_data_format: RAW - user_data: - str_replace: - params: - __repo_url_artifacts__ : { get_param: repo_url_artifacts } - __demo_artifacts_version__ : { get_param: demo_artifacts_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 } - __compile_state__ : {get_param : compile_state} - template: | - #!/bin/bash - - # Create configuration files - mkdir /opt/config - echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt - echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_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 - echo "__compile_state__" > /opt/config/compile_state.txt - - # Download and run install script - 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_build.sh - cd /opt - chmod +x v_gmux_build.sh - ./v_gmux_build.sh diff --git a/heat/vCPE/vgw/build_vcpe_vgw.env b/heat/vCPE/vgw/build_vcpe_vgw.env deleted file mode 100644 index def032f5..00000000 --- a/heat/vCPE/vgw/build_vcpe_vgw.env +++ /dev/null @@ -1,19 +0,0 @@ - parameters: - vcpe_image_name: PUT THE IMAGE NAME HERE (Ubuntu 1604 SUGGESTED) - vcpe_flavor_name: PUT THE FLAVOR NAME HERE (MEDIUM FLAVOR SUGGESTED) - public_net_id: PUT THE PUBLIC NETWORK ID HERE - vgw_name_0: zdcpe1cpe01gw01 - vnf_id: vCPE_Infrastructure_GW_demo_app - vf_module_id: vCPE_Customer_GW - dcae_collector_ip: 10.0.4.1 - dcae_collector_port: 8081 - repo_url_artifacts: https://nexus.onap.org/content/repositories/staging - demo_artifacts_version: 1.3.0 - script_version: 1.3.0-SNAPSHOT - key_name: vgw_key - pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN - cloud_env: PUT THE CLOUD PROVIDED HERE (openstack or rackspace) - vpp_source_repo_url: https://gerrit.fd.io/r/vpp - vpp_source_repo_release_tag: v17.04 - hc2vpp_source_repo_url: https://gerrit.fd.io/r/hc2vpp - hc2vpp_source_repo_release_tag: v1.17.04 diff --git a/heat/vCPE/vgw/build_vcpe_vgw.yaml b/heat/vCPE/vgw/build_vcpe_vgw.yaml deleted file mode 100644 index 3bd8532b..00000000 --- a/heat/vCPE/vgw/build_vcpe_vgw.yaml +++ /dev/null @@ -1,194 +0,0 @@ -########################################################################## -# -#==================LICENSE_START========================================== -# -# -# Copyright 2017 AT&T Intellectual Property. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -#==================LICENSE_END============================================ -# -# ECOMP is a trademark and service mark of AT&T Intellectual Property. -# -########################################################################## - -heat_template_version: 2013-05-23 - -description: Heat template to build vCPE vGateway (vG) - -############## -# # -# PARAMETERS # -# # -############## - -parameters: - vcpe_image_name: - type: string - label: Image name or ID - description: Image to be used for compute instance - vcpe_flavor_name: - type: string - label: Flavor - description: Type of instance (flavor) to be used - public_net_id: - type: string - label: Public network name or ID - description: Public network that enables remote connection to VNF - vgw_name_0: - type: string - label: vGW name - description: Name of the vGW - vnf_id: - type: string - label: VNF ID - description: The VNF ID is provided by ONAP - vf_module_id: - type: string - label: vCPE module ID - description: The vCPE Module ID is provided by ONAP - dcae_collector_ip: - type: string - label: DCAE collector IP address - description: IP address of the DCAE collector - dcae_collector_port: - type: string - label: DCAE collector port - description: Port of the DCAE collector - key_name: - type: string - label: Key pair name - description: Public/Private key pair name - pub_key: - 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 - script_version: - type: string - label: Script version number - description: Version number of the scripts that build the vGW - demo_artifacts_version: - type: string - label: Artifacts version used in demo vnfs - description: Artifacts (jar, tar.gz) version used in demo vnfs - nexus_artifact_repo: - type: string - 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_release_tag: - type: string - label: VPP Source Git Release tag - description: Git release 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 release tag for the Honeycomb source codes - # Compile_state parameter is added to provide backward compatibility for Beijing and Amsterdam releases - compile_state: - type: string - label: Compile State - description: State to compile code or not - default: "done" - -############# -# # -# RESOURCES # -# # -############# - -resources: - - random-str: - type: OS::Heat::RandomString - properties: - length: 4 - - my_keypair: - type: OS::Nova::KeyPair - properties: - name: - str_replace: - template: base_rand - params: - base: { get_param: key_name } - rand: { get_resource: random-str } - public_key: { get_param: pub_key } - save_private_key: false - - # Virtual GW Instantiation - - vgw_0: - type: OS::Nova::Server - properties: - image: { get_param: vcpe_image_name } - flavor: { get_param: vcpe_flavor_name } - name: { get_param: vgw_name_0 } - key_name: { get_resource: my_keypair } - networks: - - network: { get_param: public_net_id } - metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }} - user_data_format: RAW - user_data: - str_replace: - params: - __repo_url_artifacts__ : { get_param: repo_url_artifacts } - __demo_artifacts_version__ : { get_param: demo_artifacts_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 } - __nexus_artifact_repo__: { get_param: nexus_artifact_repo } - __compile_state__ : {get_param : compile_state} - template: | - #!/bin/bash - - # Create configuration files - mkdir /opt/config - echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt - echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_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 "__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 "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt - echo "__compile_state__" > /opt/config/compile_state.txt - - # Download and run install script - 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_gw_build.sh - cd /opt - chmod +x v_gw_build.sh - ./v_gw_build.sh - -- cgit 1.2.3-korg