From 654fdf0c807e436d59b160e0bc9100e7af35eba8 Mon Sep 17 00:00:00 2001 From: Praneta Paithankar Date: Tue, 7 Aug 2018 10:16:39 -0700 Subject: [PATCH] Refactor vCPE vG-MUX and vG image creation process MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- heat/vCPE/vgmux/base_vcpe_vgmux.env | 11 +- heat/vCPE/vgmux/base_vcpe_vgmux.yaml | 71 +------ heat/vCPE/vgmux/build_vcpe_vgmux.env | 22 +++ heat/vCPE/vgmux/build_vcpe_vgmux.yaml | 212 ++++++++++++++++++++ heat/vCPE/vgw/base_vcpe_vgw.env | 8 +- heat/vCPE/vgw/base_vcpe_vgw.yaml | 53 +---- heat/vCPE/vgw/build_vcpe_vgw.env | 19 ++ heat/vCPE/vgw/build_vcpe_vgw.yaml | 195 +++++++++++++++++++ vnfs/vCPE/scripts/v_gmux_build.sh | 199 +++++++++++++++++++ vnfs/vCPE/scripts/v_gmux_install.sh | 351 +++++++--------------------------- vnfs/vCPE/scripts/v_gw_build.sh | 170 ++++++++++++++++ vnfs/vCPE/scripts/v_gw_install.sh | 294 +++++----------------------- 12 files changed, 958 insertions(+), 647 deletions(-) create mode 100644 heat/vCPE/vgmux/build_vcpe_vgmux.env create mode 100644 heat/vCPE/vgmux/build_vcpe_vgmux.yaml create mode 100644 heat/vCPE/vgw/build_vcpe_vgw.env create mode 100644 heat/vCPE/vgw/build_vcpe_vgw.yaml create mode 100644 vnfs/vCPE/scripts/v_gmux_build.sh create mode 100644 vnfs/vCPE/scripts/v_gw_build.sh diff --git a/heat/vCPE/vgmux/base_vcpe_vgmux.env b/heat/vCPE/vgmux/base_vcpe_vgmux.env index c1f919e8..48a4c8f8 100644 --- a/heat/vCPE/vgmux/base_vcpe_vgmux.env +++ b/heat/vCPE/vgmux/base_vcpe_vgmux.env @@ -21,16 +21,7 @@ bng_gmux_private_ip: 10.1.0.10 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 - install_script_version: 1.3.0-SNAPSHOT + 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.patch 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 diff --git a/heat/vCPE/vgmux/build_vcpe_vgmux.env b/heat/vCPE/vgmux/build_vcpe_vgmux.env new file mode 100644 index 00000000..47863acd --- /dev/null +++ b/heat/vCPE/vgmux/build_vcpe_vgmux.env @@ -0,0 +1,22 @@ + 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 new file mode 100644 index 00000000..c2bd4f4d --- /dev/null +++ b/heat/vCPE/vgmux/build_vcpe_vgmux.yaml @@ -0,0 +1,212 @@ +########################################################################## +# +#==================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=__install_script_version__" -o /opt/vcpe-scripts-__script_version__.zip + unzip -j /opt/vcpe-scripts-__script_version__.zip -d /opt v_gmux_build.sh + sudo su - + cd /opt + chmod +x v_gmux_build.sh + ./v_gmux_build.sh diff --git a/heat/vCPE/vgw/base_vcpe_vgw.env b/heat/vCPE/vgw/base_vcpe_vgw.env index c319598e..977dce1e 100644 --- a/heat/vCPE/vgw/base_vcpe_vgw.env +++ b/heat/vCPE/vgw/base_vcpe_vgw.env @@ -22,13 +22,7 @@ vg_vgmux_tunnel_vni: 100 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 - install_script_version: 1.3.0-SNAPSHOT + 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/base_vcpe_vgw.yaml b/heat/vCPE/vgw/base_vcpe_vgw.yaml index 0847b69d..e58634c6 100644 --- a/heat/vCPE/vgw/base_vcpe_vgw.yaml +++ b/heat/vCPE/vgw/base_vcpe_vgw.yaml @@ -122,18 +122,10 @@ parameters: type: string label: Public key description: Public key to be installed on the compute instance - repo_url_artifacts: + script_version: type: string - label: Repository URL - description: URL of the repository that hosts the demo packages - install_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 + label: Script version number + description: Version number of the scripts that install the vGW nexus_artifact_repo: type: string description: Root URL for the Nexus repository for Maven artifacts. @@ -142,22 +134,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 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 mux_ip_addr: type: string label: vGMUX IP address @@ -234,14 +210,8 @@ resources: __oam_cidr__ : { get_param: onap_private_net_cidr } __cpe_public_net_cidr__ : { get_param: cpe_public_net_cidr } __mux_gw_private_net_cidr__ : { get_param: mux_gw_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 } __mux_ip_addr__: { get_param: mux_ip_addr } __vg_vgmux_tunnel_vni__: { get_param: vg_vgmux_tunnel_vni } __nexus_artifact_repo__: { get_param: nexus_artifact_repo } @@ -255,23 +225,18 @@ resources: echo "__cpe_public_net_cidr__" > /opt/config/cpe_public_net_cidr.txt echo "__mux_gw_private_net_ipaddr__" > /opt/config/mux_gw_private_net_ipaddr.txt echo "__mux_gw_private_net_cidr__" > /opt/config/mux_gw_private_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 "__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 "__mux_ip_addr__" > /opt/config/mux_ip_addr.txt echo "__vg_vgmux_tunnel_vni__" > /opt/config/vg_vgmux_tunnel_vni.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_gw_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_gw_install.sh + sudo su - cd /opt chmod +x v_gw_install.sh ./v_gw_install.sh diff --git a/heat/vCPE/vgw/build_vcpe_vgw.env b/heat/vCPE/vgw/build_vcpe_vgw.env new file mode 100644 index 00000000..def032f5 --- /dev/null +++ b/heat/vCPE/vgw/build_vcpe_vgw.env @@ -0,0 +1,19 @@ + 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 new file mode 100644 index 00000000..a80d1ef3 --- /dev/null +++ b/heat/vCPE/vgw/build_vcpe_vgw.yaml @@ -0,0 +1,195 @@ +########################################################################## +# +#==================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 + sudo su - + cd /opt + chmod +x v_gw_build.sh + ./v_gw_build.sh + diff --git a/vnfs/vCPE/scripts/v_gmux_build.sh b/vnfs/vCPE/scripts/v_gmux_build.sh new file mode 100644 index 00000000..da357b03 --- /dev/null +++ b/vnfs/vCPE/scripts/v_gmux_build.sh @@ -0,0 +1,199 @@ +#!/bin/bash + + +VPP_SOURCE_REPO_URL=$(cat /opt/config/vpp_source_repo_url.txt) +VPP_SOURCE_REPO_RELEASE_TAG=$(cat /opt/config/vpp_source_repo_release_tag.txt) +VPP_PATCH_URL=$(cat /opt/config/vpp_patch_url.txt) +HC2VPP_SOURCE_REPO_URL=$(cat /opt/config/hc2vpp_source_repo_url.txt) +HC2VPP_SOURCE_REPO_RELEASE_TAG=$(cat /opt/config/hc2vpp_source_repo_release_tag.txt) +HC2VPP_PATCH_URL=$(cat /opt/config/hc2vpp_patch_url.txt) +LIBEVEL_PATCH_URL=$(cat /opt/config/libevel_patch_url.txt) +CLOUD_ENV=$(cat /opt/config/cloud_env.txt) + + +# Download required dependencies +echo "deb http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list +echo "deb-src http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list +apt-get update +apt-get install --allow-unauthenticated -y wget openjdk-8-jdk apt-transport-https ca-certificates g++ libcurl4-gnutls-dev +sleep 1 + +# Install the tools required for download codes +apt-get install -y expect git patch make linux-image-extra-`uname -r` + +#Download and build the VPP codes +cd /opt +git clone ${VPP_SOURCE_REPO_URL} -b ${VPP_SOURCE_REPO_RELEASE_TAG} vpp +wget -O Vpp-Add-VES-agent-for-vG-MUX.patch ${VPP_PATCH_URL} + +cd vpp +patch -p1 < ../Vpp-Add-VES-agent-for-vG-MUX.patch +expect -c " + spawn make install-dep; + expect { + \"Do you want to continue?*\" {send \"Y\r\"; interact} + } +" + +# Install the evel-library first since we need the lib +cd /opt +apt-get install -y libcurl4-openssl-dev +git clone http://gerrit.onap.org/r/demo +wget -O vCPE-vG-MUX-libevel-fixup.patch ${LIBEVEL_PATCH_URL} +cd demo +git checkout 312996e2 +patch -p1 < ../vCPE-vG-MUX-libevel-fixup.patch +cd vnfs/VES5.0/evel/evel-library/bldjobs +make +cp ../libs/x86_64/libevel.so /usr/lib +ldconfig + +cd /opt/vpp/build-root +./bootstrap.sh +make V=0 PLATFORM=vpp TAG=vpp install-deb + +# Install the VPP package +apt install -y python-ply-lex-3.5 python-ply-yacc-3.5 python-pycparser python-cffi +dpkg -i *.deb +systemctl stop vpp + + + +# Download and install HC2VPP from source +cd /opt +git clone ${HC2VPP_SOURCE_REPO_URL} -b ${HC2VPP_SOURCE_REPO_RELEASE_TAG} hc2vpp +wget -O Hc2vpp-Add-VES-agent-for-vG-MUX.patch ${HC2VPP_PATCH_URL} + +apt-get install -y maven +mkdir -p ~/.m2 +cat > ~/.m2/settings.xml << EOF + + + + + + + fd.io-release + + + fd.io-mirror + fd.io-mirror + https://nexus.fd.io/content/groups/public/ + + true + never + + + false + + + + + + fd.io-mirror + fd.io-mirror + https://nexus.fd.io/content/repositories/public/ + + true + never + + + false + + + + + + + fd.io-snapshots + + + fd.io-snapshot + fd.io-snapshot + https://nexus.fd.io/content/repositories/fd.io.snapshot/ + + false + + + true + + + + + + fd.io-snapshot + fd.io-snapshot + https://nexus.fd.io/content/repositories/fd.io.snapshot/ + + false + + + true + + + + + + opendaylight-snapshots + + + opendaylight-snapshot + opendaylight-snapshot + https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ + + false + + + true + + + + + + opendaylight-shapshot + opendaylight-snapshot + https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ + + false + + + true + + + + + + + + fd.io-release + fd.io-snapshots + opendaylight-snapshots + + +EOF + +cd hc2vpp +patch -p1 < ../Hc2vpp-Add-VES-agent-for-vG-MUX.patch +p_version_snap=$(cat ves/ves-impl/pom.xml | grep -A 1 "jvpp-ves" | tail -1) +p_version_snap=$(echo "${p_version_snap%<*}") +p_version_snap=$(echo "${p_version_snap#*>}") +p_version=$(echo "${p_version_snap%-*}") +mkdir -p ~/.m2/repository/io/fd/vpp/jvpp-ves/${p_version_snap} +mvn install:install-file -Dfile=/usr/share/java/jvpp-ves-${p_version}.jar -DgroupId=io.fd.vpp -DartifactId=jvpp-ves -Dversion=${p_version_snap} -Dpackaging=jar +mvn clean install -nsu -DskipTests=true +l_version=$(cat pom.xml | grep "" | head -1) +l_version=$(echo "${l_version%<*}") +l_version=$(echo "${l_version#*>}") +mv vpp-integration/minimal-distribution/target/vpp-integration-distribution-${l_version}-hc/vpp-integration-distribution-${l_version} /opt/honeycomb +sed -i 's/127.0.0.1/0.0.0.0/g' /opt/honeycomb/config/honeycomb.json + +# Disable automatic upgrades +if [[ $CLOUD_ENV != "rackspace" ]] +then + echo "APT::Periodic::Unattended-Upgrade \"0\";" >> /etc/apt/apt.conf.d/10periodic + sed -i 's/\(APT::Periodic::Unattended-Upgrade\) "1"/\1 "0"/' /etc/apt/apt.conf.d/20auto-upgrades +fi + + diff --git a/vnfs/vCPE/scripts/v_gmux_install.sh b/vnfs/vCPE/scripts/v_gmux_install.sh index a24cee6c..c9162aac 100644 --- a/vnfs/vCPE/scripts/v_gmux_install.sh +++ b/vnfs/vCPE/scripts/v_gmux_install.sh @@ -1,15 +1,6 @@ #!/bin/bash -REPO_URL_ARTIFACTS=$(cat /opt/config/repo_url_artifacts.txt) -DEMO_ARTIFACTS_VERSION=$(cat /opt/config/demo_artifacts_version.txt) -INSTALL_SCRIPT_VERSION=$(cat /opt/config/install_script_version.txt) -VPP_SOURCE_REPO_URL=$(cat /opt/config/vpp_source_repo_url.txt) -VPP_SOURCE_REPO_RELEASE_TAG=$(cat /opt/config/vpp_source_repo_release_tag.txt) -VPP_PATCH_URL=$(cat /opt/config/vpp_patch_url.txt) -HC2VPP_SOURCE_REPO_URL=$(cat /opt/config/hc2vpp_source_repo_url.txt) -HC2VPP_SOURCE_REPO_RELEASE_TAG=$(cat /opt/config/hc2vpp_source_repo_release_tag.txt) -HC2VPP_PATCH_URL=$(cat /opt/config/hc2vpp_patch_url.txt) -LIBEVEL_PATCH_URL=$(cat /opt/config/libevel_patch_url.txt) +SCRIPT_VERSION=$(cat /opt/config/script_version.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) MUX_GW_IP=$(cat /opt/config/mux_gw_net_ipaddr.txt) MUX_GW_CIDR=$(cat /opt/config/mux_gw_net_cidr.txt) @@ -18,16 +9,6 @@ BNG_MUX_CIDR=$(cat /opt/config/bng_mux_net_cidr.txt) BRG_BNG_CIDR=$(cat /opt/config/brg_bng_net_cidr.txt) BNG_TO_MUX_IP=$(cat /opt/config/bng_to_mux_net_ipaddr.txt) -# Build states are: -# 'build' - just build the code -# 'done' - code is build, install and setup -# 'auto' - bulid, install and setup -BUILD_STATE="auto" -if [[ -f /opt/config/compile_state.txt ]] -then - BUILD_STATE=$(cat /opt/config/compile_state.txt) -fi - # Convert Network CIDR to Netmask cdr2mask () { # Number of args to shift, 255..255, first non-255 byte, zeroes @@ -37,83 +18,30 @@ cdr2mask () { } # OpenStack network configuration -if [[ $BUILD_STATE != "build" ]] +if [[ $CLOUD_ENV == "openstack" ]] then - if [[ $CLOUD_ENV == "openstack" ]] - then - echo 127.0.0.1 $(hostname) >> /etc/hosts - - # Allow remote login as root - mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk - cp /home/ubuntu/.ssh/authorized_keys /root/.ssh - - MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) - - IP=$(cat /opt/config/oam_ipaddr.txt) - BITS=$(cat /opt/config/oam_cidr.txt | cut -d"/" -f2) - NETMASK=$(cdr2mask $BITS) - echo "auto eth2" >> /etc/network/interfaces - echo "iface eth2 inet static" >> /etc/network/interfaces - echo " address $IP" >> /etc/network/interfaces - echo " netmask $NETMASK" >> /etc/network/interfaces - echo " mtu $MTU" >> /etc/network/interfaces - - ifup eth2 - fi -fi # endif BUILD_STATE != "build" - -if [[ $BUILD_STATE != "done" ]] -then - # Download required dependencies - echo "deb http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list - echo "deb-src http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list - apt-get update - apt-get install --allow-unauthenticated -y wget openjdk-8-jdk apt-transport-https ca-certificates g++ libcurl4-gnutls-dev - sleep 1 - - # Install the tools required for download codes - apt-get install -y expect git patch make linux-image-extra-`uname -r` - - #Download and build the VPP codes - cd /opt - git clone ${VPP_SOURCE_REPO_URL} -b ${VPP_SOURCE_REPO_RELEASE_TAG} vpp - wget -O Vpp-Add-VES-agent-for-vG-MUX.patch ${VPP_PATCH_URL} - - cd vpp - patch -p1 < ../Vpp-Add-VES-agent-for-vG-MUX.patch - expect -c " - spawn make install-dep; - expect { - \"Do you want to continue?*\" {send \"Y\r\"; interact} - } - " - - # Install the evel-library first since we need the lib - cd /opt - apt-get install -y libcurl4-openssl-dev - git clone http://gerrit.onap.org/r/demo - wget -O vCPE-vG-MUX-libevel-fixup.patch ${LIBEVEL_PATCH_URL} - cd demo - patch -p1 < ../vCPE-vG-MUX-libevel-fixup.patch - cd vnfs/VES5.0/evel/evel-library/bldjobs - make - cp ../libs/x86_64/libevel.so /usr/lib - ldconfig - - cd /opt/vpp/build-root - ./bootstrap.sh - make V=0 PLATFORM=vpp TAG=vpp install-deb - - # Install the VPP package - apt install -y python-ply-lex-3.5 python-ply-yacc-3.5 python-pycparser python-cffi - dpkg -i *.deb - systemctl stop vpp -fi # endif BUILD_STATE != "done" - -if [[ $BUILD_STATE != "build" ]] -then - # Auto-start configuration for the VPP - cat > /etc/vpp/startup.conf << EOF + echo 127.0.0.1 $(hostname) >> /etc/hosts + + # Allow remote login as root + mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk + cp /home/ubuntu/.ssh/authorized_keys /root/.ssh + + MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) + + IP=$(cat /opt/config/oam_ipaddr.txt) + BITS=$(cat /opt/config/oam_cidr.txt | cut -d"/" -f2) + NETMASK=$(cdr2mask $BITS) + echo "auto eth2" >> /etc/network/interfaces + echo "iface eth2 inet static" >> /etc/network/interfaces + echo " address $IP" >> /etc/network/interfaces + echo " netmask $NETMASK" >> /etc/network/interfaces + echo " mtu $MTU" >> /etc/network/interfaces + + ifup eth2 +fi + +# Auto-start configuration for the VPP +cat > /etc/vpp/startup.conf << EOF unix { nodaemon @@ -218,22 +146,22 @@ cpu { EOF - # Get list of network device PCI bus addresses - get_nic_pci_list() { - while read -r line ; do - if [ "$line" != "${line#*network device}" ]; then - echo -n "${line%% *} " - fi - done < <(lspci) - } +# Get list of network device PCI bus addresses +get_nic_pci_list() { + while read -r line ; do + if [ "$line" != "${line#*network device}" ]; then + echo -n "${line%% *} " + fi + done < <(lspci) +} - NICS=$(get_nic_pci_list) - NICS=`echo ${NICS} | sed 's/[0]\+\([0-9]\)/\1/g' | sed 's/[.:]/\//g'` +NICS=$(get_nic_pci_list) +NICS=`echo ${NICS} | sed 's/[0]\+\([0-9]\)/\1/g' | sed 's/[.:]/\//g'` - BNG_MUX_NIC=GigabitEthernet`echo ${NICS} | cut -d " " -f 2` # second interface in list - MUX_GW_NIC=GigabitEthernet`echo ${NICS} | cut -d " " -f 4` # fourth interface in list +BNG_MUX_NIC=GigabitEthernet`echo ${NICS} | cut -d " " -f 2` # second interface in list +MUX_GW_NIC=GigabitEthernet`echo ${NICS} | cut -d " " -f 4` # fourth interface in list - cat > /etc/vpp/setup.gate << EOF +cat > /etc/vpp/setup.gate << EOF set int state ${BNG_MUX_NIC} up set int ip address ${BNG_MUX_NIC} ${MUX_TO_BNG_IP}/${BNG_MUX_CIDR#*/} @@ -242,152 +170,9 @@ set int ip address ${MUX_GW_NIC} ${MUX_GW_IP}/${MUX_GW_CIDR#*/} ip route add ${BRG_BNG_CIDR} via ${BNG_TO_MUX_IP} ${BNG_MUX_NIC} EOF -fi # endif BUILD_STATE != "build" -if [[ $BUILD_STATE != "done" ]] -then - # Download and install HC2VPP from source - cd /opt - git clone ${HC2VPP_SOURCE_REPO_URL} -b ${HC2VPP_SOURCE_REPO_RELEASE_TAG} hc2vpp - wget -O Hc2vpp-Add-VES-agent-for-vG-MUX.patch ${HC2VPP_PATCH_URL} - - apt-get install -y maven - mkdir -p ~/.m2 - cat > ~/.m2/settings.xml << EOF - - - - - - - fd.io-release - - - fd.io-mirror - fd.io-mirror - https://nexus.fd.io/content/groups/public/ - - true - never - - - false - - - - - - fd.io-mirror - fd.io-mirror - https://nexus.fd.io/content/repositories/public/ - - true - never - - - false - - - - - - - fd.io-snapshots - - - fd.io-snapshot - fd.io-snapshot - https://nexus.fd.io/content/repositories/fd.io.snapshot/ - - false - - - true - - - - - - fd.io-snapshot - fd.io-snapshot - https://nexus.fd.io/content/repositories/fd.io.snapshot/ - - false - - - true - - - - - - opendaylight-snapshots - - - opendaylight-snapshot - opendaylight-snapshot - https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ - - false - - - true - - - - - - opendaylight-shapshot - opendaylight-snapshot - https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ - - false - - - true - - - - - - - - fd.io-release - fd.io-snapshots - opendaylight-snapshots - - -EOF - - cd hc2vpp - patch -p1 < ../Hc2vpp-Add-VES-agent-for-vG-MUX.patch - p_version_snap=$(cat ves/ves-impl/pom.xml | grep -A 1 "jvpp-ves" | tail -1) - p_version_snap=$(echo "${p_version_snap%<*}") - p_version_snap=$(echo "${p_version_snap#*>}") - p_version=$(echo "${p_version_snap%-*}") - mkdir -p ~/.m2/repository/io/fd/vpp/jvpp-ves/${p_version_snap} - mvn install:install-file -Dfile=/usr/share/java/jvpp-ves-${p_version}.jar -DgroupId=io.fd.vpp -DartifactId=jvpp-ves -Dversion=${p_version_snap} -Dpackaging=jar - mvn clean install -nsu -DskipTests=true - l_version=$(cat pom.xml | grep "" | head -1) - l_version=$(echo "${l_version%<*}") - l_version=$(echo "${l_version#*>}") - mv vpp-integration/minimal-distribution/target/vpp-integration-distribution-${l_version}-hc/vpp-integration-distribution-${l_version} /opt/honeycomb - sed -i 's/127.0.0.1/0.0.0.0/g' /opt/honeycomb/config/honeycomb.json - - # Disable automatic upgrades - if [[ $CLOUD_ENV != "rackspace" ]] - then - echo "APT::Periodic::Unattended-Upgrade \"0\";" >> /etc/apt/apt.conf.d/10periodic - sed -i 's/\(APT::Periodic::Unattended-Upgrade\) "1"/\1 "0"/' /etc/apt/apt.conf.d/20auto-upgrades - fi -fi # endif BUILD_STATE != "done" - -if [[ $BUILD_STATE != "build" ]] -then - # Create systemctl service for Honeycomb - cat > /etc/systemd/system/honeycomb.service << EOF +# Create systemctl service for Honeycomb +cat > /etc/systemd/system/honeycomb.service << EOF [Unit] Description=Honeycomb Agent for the VPP control plane Documentation=https://wiki.fd.io/view/Honeycomb @@ -403,11 +188,11 @@ RestartSec=10 [Install] WantedBy=multi-user.target EOF - systemctl enable /etc/systemd/system/honeycomb.service +systemctl enable /etc/systemd/system/honeycomb.service - # Create script that is used to reset the ves mode configuration - # when the honeycomb service is stopped - cat > /opt/reset_ves_mode.sh << EOF +# Create script that is used to reset the ves mode configuration +# when the honeycomb service is stopped +cat > /opt/reset_ves_mode.sh << EOF #!/bin/bash mode_data=\$(curl -X GET -u admin:admin http://127.0.0.1:8183/restconf/config/vesagent:vesagent/mode 2>/dev/null | sed s/\"base-packet-loss\":[0-9]\*,/\"base-packet-loss\":0,/) if [[ "\${mode_data}" != "" ]] @@ -549,7 +334,7 @@ EOF cat > /etc/systemd/system/autosave.service << EOF [Unit] Description=Run Scripts at Start and Stop -Requires=vpp.service +equires=vpp.service After=vpp.service [Service] @@ -560,27 +345,27 @@ ExecStop=/usr/bin/save_config [Install] WantedBy=multi-user.target EOF - systemctl enable /etc/systemd/system/autosave.service - - # Download DHCP config files - cd /opt - unzip -p -j /opt/vcpe-scripts-$INSTALL_SCRIPT_VERSION.zip v_gmux_init.sh > /opt/v_gmux_init.sh - unzip -p -j /opt/vcpe-scripts-$INSTALL_SCRIPT_VERSION.zip v_gmux.sh > /opt/v_gmux.sh - chmod +x v_gmux_init.sh - chmod +x v_gmux.sh - mv v_gmux.sh /etc/init.d - update-rc.d v_gmux.sh defaults - - # Rename network interface in openstack Ubuntu 16.04 images. Then, reboot the VM to pick up changes - if [[ $CLOUD_ENV != "rackspace" ]] - then - sed -i "s/GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"net.ifnames=0 biosdevname=0\"/g" /etc/default/grub - grub-mkconfig -o /boot/grub/grub.cfg - sed -i "s/ens[0-9]*/eth0/g" /etc/network/interfaces.d/*.cfg - sed -i "s/ens[0-9]*/eth0/g" /etc/udev/rules.d/70-persistent-net.rules - echo 'network: {config: disabled}' >> /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg - reboot - fi - - ./v_gmux_init.sh -fi # endif BUILD_STATE != "build" +systemctl enable /etc/systemd/system/autosave.service + +# Download DHCP config files +cd /opt +unzip -p -j /opt/vcpe-scripts-$SCRIPT_VERSION.zip v_gmux_init.sh > /opt/v_gmux_init.sh +unzip -p -j /opt/vcpe-scripts-$SCRIPT_VERSION.zip v_gmux.sh > /opt/v_gmux.sh +chmod +x v_gmux_init.sh +chmod +x v_gmux.sh +mv v_gmux.sh /etc/init.d +update-rc.d v_gmux.sh defaults + +# Rename network interface in openstack Ubuntu 16.04 images. Then, reboot the VM to pick up changes +if [[ $CLOUD_ENV != "rackspace" ]] +then + sed -i "s/GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"net.ifnames=0 biosdevname=0\"/g" /etc/default/grub + grub-mkconfig -o /boot/grub/grub.cfg + sed -i "s/ens[0-9]*/eth0/g" /etc/network/interfaces.d/*.cfg + sed -i "s/ens[0-9]*/eth0/g" /etc/udev/rules.d/70-persistent-net.rules + echo 'network: {config: disabled}' >> /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg + reboot +fi + +./v_gmux_init.sh + diff --git a/vnfs/vCPE/scripts/v_gw_build.sh b/vnfs/vCPE/scripts/v_gw_build.sh new file mode 100644 index 00000000..7c03c385 --- /dev/null +++ b/vnfs/vCPE/scripts/v_gw_build.sh @@ -0,0 +1,170 @@ +#!/bin/bash + + +VPP_SOURCE_REPO_URL=$(cat /opt/config/vpp_source_repo_url.txt) +VPP_SOURCE_REPO_RELEASE_TAG=$(cat /opt/config/vpp_source_repo_release_tag.txt) +HC2VPP_SOURCE_REPO_URL=$(cat /opt/config/hc2vpp_source_repo_url.txt) +HC2VPP_SOURCE_REPO_RELEASE_TAG=$(cat /opt/config/hc2vpp_source_repo_release_tag.txt) +CLOUD_ENV=$(cat /opt/config/cloud_env.txt) + + +# Download required dependencies +echo "deb http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list +echo "deb-src http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list +apt-get --allow-unauthenticated update +apt-get install --allow-unauthenticated -y wget openjdk-8-jdk apt-transport-https ca-certificates g++ libcurl4-gnutls-dev +sleep 1 + +# Install the tools required for download codes +apt-get --allow-unauthenticated install -y expect git make linux-image-extra-`uname -r` + +#Install DHCP server +apt-get install -y isc-dhcp-server + +#Download and build the VPP codes +cd /opt +git clone ${VPP_SOURCE_REPO_URL} -b ${VPP_SOURCE_REPO_RELEASE_TAG} vpp + +cd vpp +yes y | make install-dep + +cd build-root +./bootstrap.sh +make V=0 PLATFORM=vpp TAG=vpp install-deb + +# Install the VPP package +dpkg -i *.deb +systemctl stop vpp + + + +# Download and install HC2VPP from source +cd /opt +git clone ${HC2VPP_SOURCE_REPO_URL} -b ${HC2VPP_SOURCE_REPO_RELEASE_TAG} hc2vpp + +apt --allow-unauthenticated install -y python-ply-lex-3.5 python-ply-yacc-3.5 python-pycparser python-cffi +apt-get install -y maven +mkdir -p ~/.m2 +cat > ~/.m2/settings.xml << EOF + + + + + + + fd.io-release + + + fd.io-mirror + fd.io-mirror + https://nexus.fd.io/content/groups/public/ + + true + never + + + false + + + + + + fd.io-mirror + fd.io-mirror + https://nexus.fd.io/content/repositories/public/ + + true + never + + + false + + + + + + + fd.io-snapshots + + + fd.io-snapshot + fd.io-snapshot + https://nexus.fd.io/content/repositories/fd.io.snapshot/ + + false + + + true + + + + + + fd.io-snapshot + fd.io-snapshot + https://nexus.fd.io/content/repositories/fd.io.snapshot/ + + false + + + true + + + + + + opendaylight-snapshots + + + opendaylight-snapshot + opendaylight-snapshot + https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ + + false + + + true + + + + + + opendaylight-shapshot + opendaylight-snapshot + https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ + + false + + + true + + + + + + + + fd.io-release + fd.io-snapshots + opendaylight-snapshots + + +EOF + +cd hc2vpp +mvn clean install +l_version=$(cat pom.xml | grep "" | head -1) +l_version=$(echo "${l_version%<*}") +l_version=$(echo "${l_version#*>}") +mv vpp-integration/minimal-distribution/target/vpp-integration-distribution-${l_version}-hc/vpp-integration-distribution-${l_version} /opt/honeycomb +sed -i 's/127.0.0.1/0.0.0.0/g' /opt/honeycomb/config/honeycomb.json + +# Disable automatic upgrades +if [[ $CLOUD_ENV != "rackspace" ]] +then + echo "APT::Periodic::Unattended-Upgrade \"0\";" >> /etc/apt/apt.conf.d/10periodic + sed -i 's/\(APT::Periodic::Unattended-Upgrade\) "1"/\1 "0"/' /etc/apt/apt.conf.d/20auto-upgrades +fi + diff --git a/vnfs/vCPE/scripts/v_gw_install.sh b/vnfs/vCPE/scripts/v_gw_install.sh index 0a6367c7..0b34d05a 100644 --- a/vnfs/vCPE/scripts/v_gw_install.sh +++ b/vnfs/vCPE/scripts/v_gw_install.sh @@ -1,27 +1,12 @@ #!/bin/bash -REPO_URL_ARTIFACTS=$(cat /opt/config/repo_url_artifacts.txt) -DEMO_ARTIFACTS_VERSION=$(cat /opt/config/demo_artifacts_version.txt) -INSTALL_SCRIPT_VERSION=$(cat /opt/config/install_script_version.txt) -VPP_SOURCE_REPO_URL=$(cat /opt/config/vpp_source_repo_url.txt) -VPP_SOURCE_REPO_RELEASE_TAG=$(cat /opt/config/vpp_source_repo_release_tag.txt) -HC2VPP_SOURCE_REPO_URL=$(cat /opt/config/hc2vpp_source_repo_url.txt) -HC2VPP_SOURCE_REPO_RELEASE_TAG=$(cat /opt/config/hc2vpp_source_repo_release_tag.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) MUX_GW_IP=$(cat /opt/config/mux_gw_private_net_ipaddr.txt) MUX_GW_CIDR=$(cat /opt/config/mux_gw_private_net_cidr.txt) MUX_IP_ADDR=$(cat /opt/config/mux_ip_addr.txt) VG_VGMUX_TUNNEL_VNI=$(cat /opt/config/vg_vgmux_tunnel_vni.txt) -# Build states are: -# 'build' - just build the code -# 'done' - code is build, install and setup -# 'auto' - bulid, install and setup -BUILD_STATE="auto" -if [[ -f /opt/config/compile_state.txt ]] -then - BUILD_STATE=$(cat /opt/config/compile_state.txt) -fi + # Convert Network CIDR to Netmask cdr2mask () { @@ -32,66 +17,31 @@ cdr2mask () { } # OpenStack network configuration -if [[ $BUILD_STATE != "build" ]] -then - if [[ $CLOUD_ENV == "openstack" ]] - then - echo 127.0.0.1 $(hostname) >> /etc/hosts - - # Allow remote login as root - mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk - cp /home/ubuntu/.ssh/authorized_keys /root/.ssh - - MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) - - IP=$(cat /opt/config/oam_ipaddr.txt) - BITS=$(cat /opt/config/oam_cidr.txt | cut -d"/" -f2) - NETMASK=$(cdr2mask $BITS) - echo "auto eth2" >> /etc/network/interfaces - echo "iface eth2 inet static" >> /etc/network/interfaces - echo " address $IP" >> /etc/network/interfaces - echo " netmask $NETMASK" >> /etc/network/interfaces - echo " mtu $MTU" >> /etc/network/interfaces - - ifup eth2 - fi -fi # endif BUILD_STATE != "build" - -if [[ $BUILD_STATE != "done" ]] -then - # Download required dependencies - echo "deb http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list - echo "deb-src http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list - apt-get --allow-unauthenticated update - apt-get install --allow-unauthenticated -y wget openjdk-8-jdk apt-transport-https ca-certificates g++ libcurl4-gnutls-dev - sleep 1 - # Install the tools required for download codes - apt-get --allow-unauthenticated install -y expect git make linux-image-extra-`uname -r` - - #Install DHCP server - apt-get install -y isc-dhcp-server +if [[ $CLOUD_ENV == "openstack" ]] +then + echo 127.0.0.1 $(hostname) >> /etc/hosts - #Download and build the VPP codes - cd /opt - git clone ${VPP_SOURCE_REPO_URL} -b ${VPP_SOURCE_REPO_RELEASE_TAG} vpp + # Allow remote login as root + mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk + cp /home/ubuntu/.ssh/authorized_keys /root/.ssh - cd vpp - make install-dep + MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) - cd build-root - ./bootstrap.sh - make V=0 PLATFORM=vpp TAG=vpp install-deb + IP=$(cat /opt/config/oam_ipaddr.txt) + BITS=$(cat /opt/config/oam_cidr.txt | cut -d"/" -f2) + NETMASK=$(cdr2mask $BITS) + echo "auto eth2" >> /etc/network/interfaces + echo "iface eth2 inet static" >> /etc/network/interfaces + echo " address $IP" >> /etc/network/interfaces + echo " netmask $NETMASK" >> /etc/network/interfaces + echo " mtu $MTU" >> /etc/network/interfaces - # Install the VPP package - dpkg -i *.deb - systemctl stop vpp -fi # endif BUILD_STATE != "done" + ifup eth2 +fi -if [[ $BUILD_STATE != "build" ]] -then - # Auto-start configuration for the VPP - cat > /etc/vpp/startup.conf << EOF +# Auto-start configuration for the VPP +cat > /etc/vpp/startup.conf << EOF unix { nodaemon @@ -197,19 +147,19 @@ cpu { EOF # Get list of network device PCI bus addresses - get_nic_pci_list() { - while read -r line ; do - if [ "$line" != "${line#*network device}" ]; then - echo -n "${line%% *} " - fi - done < <(lspci) - } +get_nic_pci_list() { + while read -r line ; do + if [ "$line" != "${line#*network device}" ]; then + echo -n "${line%% *} " + fi + done < <(lspci) +} - NICS=$(get_nic_pci_list) - NICS=`echo ${NICS} | sed 's/[0]\+\([0-9]\)/\1/g' | sed 's/[.:]/\//g'` +NICS=$(get_nic_pci_list) +NICS=`echo ${NICS} | sed 's/[0]\+\([0-9]\)/\1/g' | sed 's/[.:]/\//g'` - MUX_GW_NIC=GigabitEthernet`echo ${NICS} | cut -d " " -f 2` # second interface in list - GW_PUB_NIC=GigabitEthernet`echo ${NICS} | cut -d " " -f 4` # fourth interface in list +MUX_GW_NIC=GigabitEthernet`echo ${NICS} | cut -d " " -f 2` # second interface in list +GW_PUB_NIC=GigabitEthernet`echo ${NICS} | cut -d " " -f 4` # fourth interface in list cat > /etc/vpp/setup.gate << EOF set int state ${MUX_GW_NIC} up @@ -231,146 +181,9 @@ snat add int address ${GW_PUB_NIC} EOF -fi # endif BUILD_STATE != "build" - -if [[ $BUILD_STATE != "done" ]] -then - - # Download and install HC2VPP from source - cd /opt - git clone ${HC2VPP_SOURCE_REPO_URL} -b ${HC2VPP_SOURCE_REPO_RELEASE_TAG} hc2vpp - - apt --allow-unauthenticated install -y python-ply-lex-3.5 python-ply-yacc-3.5 python-pycparser python-cffi - apt-get install -y maven - mkdir -p ~/.m2 - cat > ~/.m2/settings.xml << EOF - - - - - - - fd.io-release - - - fd.io-mirror - fd.io-mirror - https://nexus.fd.io/content/groups/public/ - - true - never - - - false - - - - - - fd.io-mirror - fd.io-mirror - https://nexus.fd.io/content/repositories/public/ - - true - never - - - false - - - - - - - fd.io-snapshots - - - fd.io-snapshot - fd.io-snapshot - https://nexus.fd.io/content/repositories/fd.io.snapshot/ - - false - - - true - - - - - - fd.io-snapshot - fd.io-snapshot - https://nexus.fd.io/content/repositories/fd.io.snapshot/ - - false - - - true - - - - - - opendaylight-snapshots - - - opendaylight-snapshot - opendaylight-snapshot - https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ - - false - - - true - - - - - - opendaylight-shapshot - opendaylight-snapshot - https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ - - false - - - true - - - - - - - - fd.io-release - fd.io-snapshots - opendaylight-snapshots - - -EOF - cd hc2vpp - mvn clean install - l_version=$(cat pom.xml | grep "" | head -1) - l_version=$(echo "${l_version%<*}") - l_version=$(echo "${l_version#*>}") - mv vpp-integration/minimal-distribution/target/vpp-integration-distribution-${l_version}-hc/vpp-integration-distribution-${l_version} /opt/honeycomb - sed -i 's/127.0.0.1/0.0.0.0/g' /opt/honeycomb/config/honeycomb.json - - # Disable automatic upgrades - if [[ $CLOUD_ENV != "rackspace" ]] - then - echo "APT::Periodic::Unattended-Upgrade \"0\";" >> /etc/apt/apt.conf.d/10periodic - sed -i 's/\(APT::Periodic::Unattended-Upgrade\) "1"/\1 "0"/' /etc/apt/apt.conf.d/20auto-upgrades - fi -fi # endif BUILD_STATE != "done - -if [[ $BUILD_STATE != "build" ]] -then - # Create systemctl service for Honeycomb - cat > /etc/systemd/system/honeycomb.service << EOF +# Create systemctl service for Honeycomb +cat > /etc/systemd/system/honeycomb.service << EOF [Unit] Description=Honeycomb Agent for the VPP control plane Documentation=https://wiki.fd.io/view/Honeycomb @@ -385,10 +198,10 @@ RestartSec=10 [Install] WantedBy=multi-user.target EOF - systemctl enable /etc/systemd/system/honeycomb.service +systemctl enable /etc/systemd/system/honeycomb.service - # DHCP server config - cat >> /etc/dhcp/dhcpd.conf << EOF +# DHCP server config +cat >> /etc/dhcp/dhcpd.conf << EOF subnet 192.168.1.0 netmask 255.255.255.0 { range 192.168.1.2 192.168.1.253; option subnet-mask 255.255.255.0; @@ -417,9 +230,9 @@ then vppctl set interface l2 bridge tap-0 10 0 fi' > /opt/v_gw_init.sh - chmod +x v_gw_init.sh +chmod +x v_gw_init.sh - cat > /etc/systemd/system/vgw.service << EOF +cat > /etc/systemd/system/vgw.service << EOF [Unit] Description=vGW service to run after honeycomb service Requires=honeycomb.service @@ -434,21 +247,20 @@ RestartSec=10 WantedBy=multi-user.target EOF - systemctl enable /etc/systemd/system/vgw.service - - cp /etc/systemd/system/multi-user.target.wants/isc-dhcp-server.service /etc/systemd/system/ - sed -i '/Documentation/a Wants=vgw.service\nAfter=vgw.service' /etc/systemd/system/isc-dhcp-server.service - sed -i '/exec dhcpd/a Restart=always\nRestartSec=10' /etc/systemd/system/isc-dhcp-server.service - - # Rename network interface in openstack Ubuntu 16.04 images. Then, reboot the VM to pick up changes - if [[ $CLOUD_ENV != "rackspace" ]] - then - sed -i "s/GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"net.ifnames=0 biosdevname=0\"/g" /etc/default/grub - grub-mkconfig -o /boot/grub/grub.cfg - sed -i "s/ens[0-9]*/eth0/g" /etc/network/interfaces.d/*.cfg - #sed -i "s/ens[0-9]*/eth0/g" /etc/udev/rules.d/70-persistent-net.rules - echo 'network: {config: disabled}' >> /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg - reboot +systemctl enable /etc/systemd/system/vgw.service + +cp /etc/systemd/system/multi-user.target.wants/isc-dhcp-server.service /etc/systemd/system/ +sed -i '/Documentation/a Wants=vgw.service\nAfter=vgw.service' /etc/systemd/system/isc-dhcp-server.service +sed -i '/exec dhcpd/a Restart=always\nRestartSec=10' /etc/systemd/system/isc-dhcp-server.service + +# Rename network interface in openstack Ubuntu 16.04 images. Then, reboot the VM to pick up changes +if [[ $CLOUD_ENV != "rackspace" ]] +then + sed -i "s/GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"net.ifnames=0 biosdevname=0\"/g" /etc/default/grub + grub-mkconfig -o /boot/grub/grub.cfg + sed -i "s/ens[0-9]*/eth0/g" /etc/network/interfaces.d/*.cfg + #sed -i "s/ens[0-9]*/eth0/g" /etc/udev/rules.d/70-persistent-net.rules + echo 'network: {config: disabled}' >> /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg + reboot fi -fi # endif BUILD_STATE != "build" -- 2.16.6