summaryrefslogtreecommitdiffstats
path: root/ci/odl
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2015-12-23 09:37:28 -0600
committerNarinder Gupta <narinder.gupta@canonical.com>2015-12-23 09:37:28 -0600
commit230e6a9d6617d0cff1f941084779701475ef15b4 (patch)
tree3b641eeb5cf608426f3b54ae18916dc90b7e7856 /ci/odl
parentd85c2f870c53465f6d83cf6a3e14c859ddf5e587 (diff)
modified intelpod5 interfaces to remove the need of special charms.
Change-Id: Ibf93074eb56807d6c3f9b0191bf02df063248f26
Diffstat (limited to 'ci/odl')
-rwxr-xr-xci/odl/01-deploybundle.sh9
1 files changed, 4 insertions, 5 deletions
diff --git a/ci/odl/01-deploybundle.sh b/ci/odl/01-deploybundle.sh
index 03bab193..354082bc 100755
--- a/ci/odl/01-deploybundle.sh
+++ b/ci/odl/01-deploybundle.sh
@@ -44,16 +44,15 @@ case "$3" in
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
- cp maas/intel/pod5/lxc-add-more-interfaces trusty/ubuntu-nodes-controller/lxc/add-more-interfaces
- cp maas/intel/pod5/interfaces.host trusty/ubuntu-nodes-compute/network/interfaces.host
- cp maas/intel/pod5/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.724"/g' ./bundles.yaml
;;
'attvirpod1' )
# As virtual environment does not need special treatment for interfaces.