diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2015-12-17 20:41:21 -0600 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2015-12-17 20:43:17 -0600 |
| commit | ed46811f44b01cbf147bd8f4952fe93f68b441f3 (patch) | |
| tree | 4c19252b9c9a9c0e7c93255f8e118b4b29d3fa26 /ci/opencontrail | |
| parent | 593a7ad51333b5255218ead6642d900aa2809dab (diff) | |
changes needed for MAAS 1.9 where no special treatment is needed.
As MAAS 1.9 auto enabled the interfaces.
Change-Id: Ia17b37685c8a97ffd1925f7a8feb679db27ab501
Diffstat (limited to 'ci/opencontrail')
| -rwxr-xr-x | ci/opencontrail/01-deploybundle.sh | 13 |
1 files changed, 4 insertions, 9 deletions
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 |