From ed46811f44b01cbf147bd8f4952fe93f68b441f3 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Thu, 17 Dec 2015 20:41:21 -0600 Subject: changes needed for MAAS 1.9 where no special treatment is needed. As MAAS 1.9 auto enabled the interfaces. Change-Id: Ia17b37685c8a97ffd1925f7a8feb679db27ab501 --- ci/02-maasdeploy.sh | 25 +++++++++++++++++++++++++ ci/maas/intel/pod6/deployment.yaml | 2 +- ci/nosdn/01-deploybundle.sh | 13 ++++--------- ci/odl/01-deploybundle.sh | 13 ++++--------- ci/opencontrail/01-deploybundle.sh | 13 ++++--------- 5 files changed, 38 insertions(+), 28 deletions(-) diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh index 8ef8565e..290197c5 100755 --- a/ci/02-maasdeploy.sh +++ b/ci/02-maasdeploy.sh @@ -75,6 +75,15 @@ if [ "$virtinstall" -eq 1 ]; then sudo virsh net-start default fi +enableautomode() { + listofnodes=`maas maas nodes list | grep system_id | cut -d '"' -f 4` + + for nodes in $listofnodes + do + maas maas interface link-subnet $nodes $1 mode=AUTO subnet=10.4.9.0/24 + done +} + sudo maas-deployer -c deployment.yaml -d --force sudo chown $USER:$USER environments.yaml @@ -89,6 +98,22 @@ maas maas boot-source update 1 url="http://maas.ubuntu.com/images/ephemeral-v2/d maas maas boot-resources import maas maas sshkeys new key="`cat $HOME/.ssh/id_rsa.pub`" +# Enable interfaces with maas +case "$1" in + 'intelpod5' ) + ;; + 'intelpod6' ) + enableautomode eth1 || true + ;; + 'orangepod2' ) + ;; + 'attvirpod1' ) + ;; + 'juniperpod1' ) + ;; +esac + + #adding compute and control nodes VM to MAAS for deployment purpose. if [ "$virtinstall" -eq 1 ]; then # create two more VMs to do the deployment. diff --git a/ci/maas/intel/pod6/deployment.yaml b/ci/maas/intel/pod6/deployment.yaml index 0d249a7c..935ad0d8 100755 --- a/ci/maas/intel/pod6/deployment.yaml +++ b/ci/maas/intel/pod6/deployment.yaml @@ -22,7 +22,7 @@ demo-maas: apt_http_proxy: apt_sources: - - ppa:maas/stable + - ppa:maas/next - ppa:juju/stable # Virsh power settings diff --git a/ci/nosdn/01-deploybundle.sh b/ci/nosdn/01-deploybundle.sh index a945050b..8dc47efa 100755 --- a/ci/nosdn/01-deploybundle.sh +++ b/ci/nosdn/01-deploybundle.sh @@ -33,16 +33,15 @@ case "$3" in sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth1"/g' ./bundles.yaml ;; 'intelpod6' ) - cp maas/intel/pod6/interfaces.host trusty/ubuntu-nodes-controller/network/interfaces.host - cp maas/intel/pod6/lxc-add-more-interfaces trusty/ubuntu-nodes-controller/lxc/add-more-interfaces - cp maas/intel/pod6/interfaces.host trusty/ubuntu-nodes-compute/network/interfaces.host - cp maas/intel/pod6/lxc-add-more-interfaces trusty/ubuntu-nodes-compute/lxc/add-more-interfaces + # As environment does not need special treatment for interfaces for MAAS 1.9 + sed -i -- 's/local:trusty\/ubuntu-nodes-controller/cs:trusty\/ubuntu/g' ./bundles.yaml + sed -i -- 's/local:trusty\/ubuntu-nodes-compute/cs:trusty\/ubuntu/g' ./bundles.yaml # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20 sed -i -- 's/10.4.1.1/10.4.1.2/g' ./bundles.yaml # choose the correct interface to use for data network sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 10.4.9.0\/24/g' ./bundles.yaml # Choose the external port to go out from gateway to use. - sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "brPublic"/g' ./bundles.yaml + sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth2"/g' ./bundles.yaml ;; 'intelpod5' ) cp maas/intel/pod5/interfaces.host trusty/ubuntu-nodes-controller/network/interfaces.host @@ -57,10 +56,6 @@ case "$3" in sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "brPublic"/g' ./bundles.yaml ;; 'attvirpod1' ) - cp maas/att/virpod1/interfaces.host trusty/ubuntu-nodes-controller/network/interfaces.host - cp maas/att/virpod1/interfaces.host trusty/ubuntu-nodes-compute/network/interfaces.host - cp maas/att/virpod1/lxc-add-more-interfaces trusty/ubuntu-nodes-controller/lxc/add-more-interfaces - cp maas/att/virpod1/lxc-add-more-interfaces trusty/ubuntu-nodes-compute/lxc/add-more-interfaces # As virtual environment does not need special treatment for interfaces. sed -i -- 's/local:trusty\/ubuntu-nodes-controller/cs:trusty\/ubuntu/g' ./bundles.yaml sed -i -- 's/local:trusty\/ubuntu-nodes-compute/cs:trusty\/ubuntu/g' ./bundles.yaml diff --git a/ci/odl/01-deploybundle.sh b/ci/odl/01-deploybundle.sh index cb42e00a..74c603b3 100755 --- a/ci/odl/01-deploybundle.sh +++ b/ci/odl/01-deploybundle.sh @@ -33,16 +33,15 @@ case "$3" in sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth1"/g' ./bundles.yaml ;; 'intelpod6' ) - cp maas/intel/pod6/interfaces.host trusty/ubuntu-nodes-controller/network/interfaces.host - cp maas/intel/pod6/lxc-add-more-interfaces trusty/ubuntu-nodes-controller/lxc/add-more-interfaces - cp maas/intel/pod6/interfaces.host trusty/ubuntu-nodes-compute/network/interfaces.host - cp maas/intel/pod6/lxc-add-more-interfaces trusty/ubuntu-nodes-compute/lxc/add-more-interfaces + # As environment does not need special treatment for interfaces for MAAS 1.9 + sed -i -- 's/local:trusty\/ubuntu-nodes-controller/cs:trusty\/ubuntu/g' ./bundles.yaml + sed -i -- 's/local:trusty\/ubuntu-nodes-compute/cs:trusty\/ubuntu/g' ./bundles.yaml # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20 sed -i -- 's/10.4.1.1/10.4.1.2/g' ./bundles.yaml # choose the correct interface to use for data network sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 10.4.9.0\/24/g' ./bundles.yaml # Choose the external port to go out from gateway to use. - sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "brPublic"/g' ./bundles.yaml + sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth2"/g' ./bundles.yaml ;; 'intelpod5' ) cp maas/intel/pod5/interfaces.host trusty/ubuntu-nodes-controller/network/interfaces.host @@ -57,10 +56,6 @@ case "$3" in sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "brPublic"/g' ./bundles.yaml ;; 'attvirpod1' ) - cp maas/att/virpod1/interfaces.host trusty/ubuntu-nodes-controller/network/interfaces.host - cp maas/att/virpod1/interfaces.host trusty/ubuntu-nodes-compute/network/interfaces.host - cp maas/att/virpod1/lxc-add-more-interfaces trusty/ubuntu-nodes-controller/lxc/add-more-interfaces - cp maas/att/virpod1/lxc-add-more-interfaces trusty/ubuntu-nodes-compute/lxc/add-more-interfaces # As virtual environment does not need special treatment for interfaces. sed -i -- 's/local:trusty\/ubuntu-nodes-controller/cs:trusty\/ubuntu/g' ./bundles.yaml sed -i -- 's/local:trusty\/ubuntu-nodes-compute/cs:trusty\/ubuntu/g' ./bundles.yaml diff --git a/ci/opencontrail/01-deploybundle.sh b/ci/opencontrail/01-deploybundle.sh index b105fa1d..639f2c1a 100755 --- a/ci/opencontrail/01-deploybundle.sh +++ b/ci/opencontrail/01-deploybundle.sh @@ -33,16 +33,15 @@ case "$3" in sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth1"/g' ./bundles.yaml ;; 'intelpod6' ) - cp maas/intel/pod6/interfaces.host trusty/ubuntu-nodes-controller/network/interfaces.host - cp maas/intel/pod6/lxc-add-more-interfaces trusty/ubuntu-nodes-controller/lxc/add-more-interfaces - cp maas/intel/pod6/interfaces.host trusty/ubuntu-nodes-compute/network/interfaces.host - cp maas/intel/pod6/lxc-add-more-interfaces trusty/ubuntu-nodes-compute/lxc/add-more-interfaces + # As environment does not need special treatment for interfaces for MAAS 1.9 + sed -i -- 's/local:trusty\/ubuntu-nodes-controller/cs:trusty\/ubuntu/g' ./bundles.yaml + sed -i -- 's/local:trusty\/ubuntu-nodes-compute/cs:trusty\/ubuntu/g' ./bundles.yaml # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20 sed -i -- 's/10.4.1.1/10.4.1.2/g' ./bundles.yaml # choose the correct interface to use for data network sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 10.4.9.0\/24/g' ./bundles.yaml # Choose the external port to go out from gateway to use. - sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "brPublic"/g' ./bundles.yaml + sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth2"/g' ./bundles.yaml ;; 'intelpod5' ) cp maas/intel/pod5/interfaces.host trusty/ubuntu-nodes-controller/network/interfaces.host @@ -57,10 +56,6 @@ case "$3" in sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "brPublic"/g' ./bundles.yaml ;; 'attvirpod1' ) - cp maas/att/virpod1/interfaces.host trusty/ubuntu-nodes-controller/network/interfaces.host - cp maas/att/virpod1/interfaces.host trusty/ubuntu-nodes-compute/network/interfaces.host - cp maas/att/virpod1/lxc-add-more-interfaces trusty/ubuntu-nodes-controller/lxc/add-more-interfaces - cp maas/att/virpod1/lxc-add-more-interfaces trusty/ubuntu-nodes-compute/lxc/add-more-interfaces # As virtual environment does not need special treatment for interfaces. sed -i -- 's/local:trusty\/ubuntu-nodes-controller/cs:trusty\/ubuntu/g' ./bundles.yaml sed -i -- 's/local:trusty\/ubuntu-nodes-compute/cs:trusty\/ubuntu/g' ./bundles.yaml -- cgit 1.2.3-korg