From: Marco Platania Date: Fri, 27 Oct 2017 17:26:57 +0000 (+0000) Subject: Merge "Fixed vbrg Install, env and yaml scipts" X-Git-Tag: 1.0.0-Amsterdam~76 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=67b8c3aae4c9197df37e53bc7a78616c43b9b72e;hp=9ae5fe2676a7e44dac189158029e3025ae90496d;p=demo.git Merge "Fixed vbrg Install, env and yaml scipts" --- diff --git a/boot/msb_vm_init.sh b/boot/msb_vm_init.sh index b80267cd..fbbb7c5f 100644 --- a/boot/msb_vm_init.sh +++ b/boot/msb_vm_init.sh @@ -85,7 +85,7 @@ curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "sdc-deprec #sdnc curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "sdnc", "version": "v1", "url": "/","protocol": "REST", "nodes": [ {"ip": "'$SDNC_IP'","port": "8282"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "sdnc", "version": "v1", "url": "/restconf","path": "/restconf","protocol": "REST", "nodes": [ {"ip": "'$SDNC_IP'","port": "8282"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "sdnc-compatible", "version": "v1", "url": "/restconf","path": "/restconf","protocol": "REST", "nodes": [ {"ip": "'$SDNC_IP'","port": "8282"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" #multi-vim curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud", "version": "v0", "url": "/api/multicloud/v0","protocol": "REST", "nodes": [ {"ip": "'$OPENO_IP'","port": "9001"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" diff --git a/boot/vfc_vm_init.sh b/boot/vfc_vm_init.sh index 6c8e274e..5497ecf5 100755 --- a/boot/vfc_vm_init.sh +++ b/boot/vfc_vm_init.sh @@ -46,15 +46,15 @@ docker rm -f vfc_svnfm_nokia docker run -i -t -d --name vfc_wfengine_activiti -p 8804:8080 -e SERVICE_IP=$OPENO_IP -e SERVICE_PORT=8804 -e OPENPALETTE_MSB_IP=$OPENO_IP -e OPENPALETTE_MSB_PORT=80 $NEXUS_DOCKER_REPO/onap/vfc/wfengine-activiti:$DOCKER_IMAGE_VERSION docker run -i -t -d --name vfc_wfengine_mgrservice -p 8805:10550 -e SERVICE_IP=$OPENO_IP -e SERVICE_PORT=8805 -e OPENPALETTE_MSB_IP=$OPENO_IP -e OPENPALETTE_MSB_PORT=80 $NEXUS_DOCKER_REPO/onap/vfc/wfengine-mgrservice:$DOCKER_IMAGE_VERSION docker run -i -t -d --name vfc_catalog -p 8806:8806 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/catalog:$DOCKER_IMAGE_VERSION -docker run -i -t -d --name vfc_emsdriver -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/emsdriver:$DOCKER_IMAGE_VERSION -docker run -i -t -d --name vfc_gvnfmdriver -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/gvnfmdriver:$DOCKER_IMAGE_VERSION +docker run -i -t -d --name vfc_emsdriver -p 8206:8206 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/emsdriver:$DOCKER_IMAGE_VERSION +docker run -i -t -d --name vfc_gvnfmdriver -p 8484:8484 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/gvnfmdriver:$DOCKER_IMAGE_VERSION docker run -i -t -d --name vfc_jujudriver -p 8483:8483 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/jujudriver:$DOCKER_IMAGE_VERSION docker run -i -t -d --name vfc_svnfm_huawei -p 8482:8482 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/huawei:$DOCKER_IMAGE_VERSION -docker run -i -t -d --name vfc_nslcm -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/nslcm:$DOCKER_IMAGE_VERSION +docker run -i -t -d --name vfc_nslcm -p 8403:8403 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/nslcm:$DOCKER_IMAGE_VERSION docker run -i -t -d --name vfc_resmanagement -p 8480:8480 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/resmanagement:$DOCKER_IMAGE_VERSION -docker run -i -t -d --name vfc_vnflcm -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/vnflcm:$DOCKER_IMAGE_VERSION -docker run -i -t -d --name vfc_vnfmgr -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/vnfmgr:$DOCKER_IMAGE_VERSION -docker run -i -t -d --name vfc_vnfres -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/vnfres:$DOCKER_IMAGE_VERSION -docker run -i -t -d --name vfc_ztesdncdriver -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/ztesdncdriver:$DOCKER_IMAGE_VERSION -docker run -i -t -d --name vfc_ztevmanagerdriver -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/ztevmanagerdriver:$DOCKER_IMAGE_VERSION -docker run -i -t -d --name vfc_svnfm_nokia -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/nokia:$DOCKER_IMAGE_VERSION \ No newline at end of file +docker run -i -t -d --name vfc_vnflcm -p 8801:8801 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/vnflcm:$DOCKER_IMAGE_VERSION +docker run -i -t -d --name vfc_vnfmgr -p 8803:8803 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/vnfmgr:$DOCKER_IMAGE_VERSION +docker run -i -t -d --name vfc_vnfres -p 8802:8802 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/vnfres:$DOCKER_IMAGE_VERSION +docker run -i -t -d --name vfc_ztesdncdriver -p 8411:8411 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/ztesdncdriver:$DOCKER_IMAGE_VERSION +docker run -i -t -d --name vfc_ztevmanagerdriver -p 8410:8410 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/ztevmanagerdriver:$DOCKER_IMAGE_VERSION +docker run -i -t -d --name vfc_svnfm_nokia -p 8486:8486 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/nokia:$DOCKER_IMAGE_VERSION \ No newline at end of file diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index 8a04f453..06c09b9d 100644 --- a/heat/ONAP/onap_openstack.env +++ b/heat/ONAP/onap_openstack.env @@ -116,7 +116,7 @@ parameters: # dcae_code_version: 1.1.0 - dcaeos_cloud_env: PUT DCAE TARGET DEPLOYMENT STACK'S FLAVOR (e.g. OpenStack) HERE + dcaeos_cloud_env: PUT DCAE TARGET DEPLOYMENT STACK'S FLAVOR (e.g. openstack) HERE dcaeos_keystone_url: PUT DCAE TARGET DEPLOYMENT STACK'S KEYSTONE URL HERE dcaeos_openstack_region: PUT DCAE TARGET DEPLOYMENT STACK'S REGION HERE dcaeos_openstack_tenant_id: PUT DCAE TARGET DEPLOYMENT STACK'S TENANT ID HERE diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index 7aba53ec..1b9b769a 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -110,31 +110,31 @@ parameters: openstack_tenant_id: type: string - description: Openstack tenant ID + description: OpenStack tenant ID openstack_username: type: string - description: Openstack username + description: OpenStack username openstack_auth_method: type: string - description: Openstack authentication method (password VS. api-key) + description: OpenStack authentication method (password VS. api-key) openstack_api_key: type: string - description: Openstack password or API Key + description: OpenStack password or API Key horizon_url: type: string - description: URL of Openstack Horizon + description: URL of OpenStack Horizon keystone_url: type: string - description: URL of Openstack Keystone + description: URL of OpenStack Keystone cloud_env: type: string - description: Cloud Provider Name + description: Cloud Provider Name in lower case openstack_region: type: string @@ -1734,7 +1734,7 @@ resources: __dcae_float_ip__: { get_attr: [dcae_c_floating_ip, floating_ip_address] } __dns_ip_addr__: { get_param: dns_ip_addr } __external_dns__: { get_param: external_dns } - # conf for the OpensStack env where DCAE is deployed + # conf for the OpenStack env where DCAE is deployed __dcaeos_cloud_env__: { get_param: dcaeos_cloud_env } __dcaeos_keystone_url__: { get_param: dcaeos_keystone_url } __dcaeos_openstack_region__: { get_param: dcaeos_openstack_region } @@ -1793,7 +1793,7 @@ resources: echo "__dcae_float_ip__" > /opt/config/dcae_float_ip.txt echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt echo "__external_dns__" > /opt/config/external_dns.txt - # conf for the OpensStack env where DCAE is deployed + # conf for the OpenStack env where DCAE is deployed echo "__dcaeos_cloud_env__" > /opt/config/cloud_env.txt echo "__dcaeos_keystone_url__" > /opt/config/keystone_url.txt echo "__dcaeos_openstack_region__" > /opt/config/openstack_region.txt diff --git a/heat/vFW/base_vfw.yaml b/heat/vFW/base_vfw.yaml index 77b53a83..4fb19c00 100644 --- a/heat/vFW/base_vfw.yaml +++ b/heat/vFW/base_vfw.yaml @@ -3,7 +3,7 @@ #==================LICENSE_START========================================== # # -# Copyright © 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 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. diff --git a/heat/vLB/base_vlb.yaml b/heat/vLB/base_vlb.yaml index fa4fea0a..ad83f3cb 100644 --- a/heat/vLB/base_vlb.yaml +++ b/heat/vLB/base_vlb.yaml @@ -3,7 +3,7 @@ #==================LICENSE_START========================================== # # -# Copyright © 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 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. diff --git a/heat/vLB/dnsscaling.yaml b/heat/vLB/dnsscaling.yaml index 60f8bacf..759e6aeb 100644 --- a/heat/vLB/dnsscaling.yaml +++ b/heat/vLB/dnsscaling.yaml @@ -3,7 +3,7 @@ #==================LICENSE_START========================================== # # -# Copyright © 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 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. diff --git a/vnfs/vCPE/scripts/v_gw_install.sh b/vnfs/vCPE/scripts/v_gw_install.sh index 3a12d7ed..6074cdfa 100644 --- a/vnfs/vCPE/scripts/v_gw_install.sh +++ b/vnfs/vCPE/scripts/v_gw_install.sh @@ -9,6 +9,18 @@ VPP_SOURCE_REPO_BRANCH=$(cat /opt/config/vpp_source_repo_branch.txt) HC2VPP_SOURCE_REPO_URL=$(cat /opt/config/hc2vpp_source_repo_url.txt) HC2VPP_SOURCE_REPO_BRANCH=$(cat /opt/config/hc2vpp_source_repo_branch.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) + +# 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 () { @@ -19,8 +31,10 @@ cdr2mask () { } # OpenStack network configuration -if [[ $CLOUD_ENV == "openstack" ]] +if [[ $BUILD_STATE != "build" ]] then + if [[ $CLOUD_ENV == "openstack" ]] + then echo 127.0.0.1 $(hostname) >> /etc/hosts # Allow remote login as root @@ -29,15 +43,6 @@ then MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) - IP=$(cat /opt/config/mux_gw_private_net_ipaddr.txt) - BITS=$(cat /opt/config/mux_gw_private_net_cidr.txt | cut -d"/" -f2) - NETMASK=$(cdr2mask $BITS) - echo "auto eth1" >> /etc/network/interfaces - echo "iface eth1 inet static" >> /etc/network/interfaces - echo " address $IP" >> /etc/network/interfaces - echo " netmask $NETMASK" >> /etc/network/interfaces - echo " mtu $MTU" >> /etc/network/interfaces - IP=$(cat /opt/config/oam_ipaddr.txt) BITS=$(cat /opt/config/oam_cidr.txt | cut -d"/" -f2) NETMASK=$(cdr2mask $BITS) @@ -47,43 +52,42 @@ then echo " netmask $NETMASK" >> /etc/network/interfaces echo " mtu $MTU" >> /etc/network/interfaces - ifup eth1 ifup eth2 -fi + fi +fi # endif BUILD_STATE != "build" -# 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 +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 install -y expect git + # Install the tools required for download codes + apt-get --allow-unauthenticated install -y expect git make linux-image-extra-`uname -r` -#Download and build the VPP codes -cd /opt -git clone ${VPP_SOURCE_REPO_URL} -b ${VPP_SOURCE_REPO_BRANCH} vpp + #Download and build the VPP codes + cd /opt + git clone ${VPP_SOURCE_REPO_URL} -b ${VPP_SOURCE_REPO_BRANCH} vpp -cd vpp -expect -c " - set timeout 60; - spawn make install-dep; - expect { - \"Do you want to continue?*\" {send \"Y\r\"; interact} - } -" + cd vpp + make install-dep -cd build-root -./bootstrap.sh -make V=0 PLATFORM=vpp TAG=vpp install-deb + cd build-root + ./bootstrap.sh + make V=0 PLATFORM=vpp TAG=vpp install-deb -# Install the VPP package -dpkg -i *.deb -systemctl stop vpp + # Install the VPP package + dpkg -i *.deb + systemctl stop vpp +fi # endif BUILD_STATE != "done" -# Auto-start configuration for the VPP -cat > /etc/vpp/startup.conf << EOF +if [[ $BUILD_STATE != "build" ]] +then + # Auto-start configuration for the VPP + cat > /etc/vpp/startup.conf << EOF unix { nodaemon @@ -188,12 +192,28 @@ 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) + } + + 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 + +touch /etc/vpp/setup.gate cat > /etc/vpp/setup.gate << EOF -set int state GigabitEthernet0/8/0 up -set int ip address GigabitEthernet0/8/0 10.5.0.21/24 +set int state ${MUX_GW_NIC} up +set int ip address ${MUX_GW_NIC} 10.5.0.21/24 -set int state GigabitEthernet0/9/0 up -set dhcp client intfc GigabitEthernet0/9/0 hostname vg-1 +set int state ${GW_PUB_NIC} up +set dhcp client intfc ${GW_PUB_NIC} hostname vg-1 tap connect lstack address 192.168.1.1/24 set int state tap-0 up @@ -204,16 +224,28 @@ set interface l2 bridge tap-0 10 0 set interface l2 bridge vxlan_tunnel0 10 1 set bridge-domain arp term 10 -set int ip address vxlan_tunnel0 192.168.1.254/24 -set interface snat in vxlan_tunnel0 out GigabitEthernet0/9/0 +loopback create +set int l2 bridge loop0 10 bvi 2 +set int ip address loop0 192.168.1.254/24 +set int state loop0 up +set int snat in loop0 out ${GW_PUB_NIC} +snat add int address ${GW_PUB_NIC} + EOF -# Download and install HC2VPP from source -cd /opt -git clone ${HC2VPP_SOURCE_REPO_URL} -b ${HC2VPP_SOURCE_REPO_BRANCH} hc2vpp +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_BRANCH} hc2vpp -apt-get install -y maven -cat > ~/.m2/settings.xml << EOF + 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 ~/.m2/settings.xml << EOF 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 + 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 + +fi # endif BUILD_STATE != "done -# Create systemctl service for Honeycomb -cat > /etc/systemd/system/honeycomb.service << EOF +if [[ $BUILD_STATE != "build" ]] +then + # 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 @@ -345,11 +381,11 @@ RestartSec=10 [Install] WantedBy=multi-user.target EOF -systemctl enable /etc/systemd/system/honeycomb.service + systemctl enable /etc/systemd/system/honeycomb.service -# Install the DHCP server and config -apt-get install -y isc-dhcp-server -cat >> /etc/dhcp/dhcpd.conf << EOF + # Install the DHCP server and config + apt-get install -y isc-dhcp-server + 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; @@ -360,18 +396,19 @@ subnet 192.168.1.0 netmask 255.255.255.0 { } EOF -# Download DHCP config files -cd /opt -wget $REPO_URL_BLOB/org.onap.demo/vnfs/vcpe/$INSTALL_SCRIPT_VERSION/v_gw_init.sh -wget $REPO_URL_BLOB/org.onap.demo/vnfs/vcpe/$INSTALL_SCRIPT_VERSION/v_gw.sh -chmod +x v_gw_init.sh -chmod +x v_gw.sh -mv v_gw.sh /etc/init.d -update-rc.d v_gw.sh defaults - -# Rename network interface in openstack Ubuntu 16.04 images. Then, reboot the VM to pick up changes -if [[ $CLOUD_ENV != "rackspace" ]] -then + # Download DHCP config files + cd /opt + wget $REPO_URL_BLOB/org.onap.demo/vnfs/vcpe/$INSTALL_SCRIPT_VERSION/v_gw_init.sh + wget $REPO_URL_BLOB/org.onap.demo/vnfs/vcpe/$INSTALL_SCRIPT_VERSION/v_gw.sh + chmod +x v_gw_init.sh + chmod +x v_gw.sh + mv v_gw.sh /etc/init.d + sed "s/Provides:/$/ v_gw" /etc/init.d/v_gw.sh + update-rc.d v_gw.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 @@ -381,4 +418,5 @@ then reboot fi -./v_gw_init.sh + ./v_gw_init.sh +fi # endif BUILD_STATE != "build"