From 3ff5b9114e07349bb4a4b5578394bd799950dcf6 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Sat, 7 Nov 2015 00:38:58 -0600 Subject: added ubuntu charm for local deployment charm to configure the network according to the labs. Change-Id: I103b6dc243f025a4916d1057c247d01ee8f175ee --- ci/01-deploybundle.sh | 43 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 39 insertions(+), 4 deletions(-) (limited to 'ci/01-deploybundle.sh') diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh index 9de9aa22..fee0a515 100755 --- a/ci/01-deploybundle.sh +++ b/ci/01-deploybundle.sh @@ -8,7 +8,6 @@ case "$1" in ;; 'ha' ) cp odl/juju-deployer/ovs-odl-ha.yaml ./bundles.yaml - juju-deployer -d -r 13 -c bundles.yaml openstack-phase1 ;; 'tip' ) cp odl/juju-deployer/ovs-odl-tip.yaml ./bundles.yaml @@ -20,13 +19,49 @@ esac case "$3" in 'orangepod2' ) + cp maas/orange/pod2/control-interfaces.host trusty/ubuntu-nodes-controller/network/interfaces.host + cp maas/orange/pod2/lxc-add-more-interfaces trusty/ubuntu-nodes-controller/lxc/add-more-interfaces + cp maas/orange/pod2/compute-interfaces.host trusty/ubuntu-nodes-compute/network/interfaces.host + cp maas/orange/pod2/lxc-add-more-interfaces trusty/ubuntu-nodes-compute/lxc/add-more-interfaces sed -i -- 's/10.4.1.1/192.168.2.2/g' ./bundles.yaml + sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 192.168.12.0\/24/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 + sed -i -- 's/10.4.1.1/10.4.1.2/g' ./bundles.yaml + sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 10.4.9.0\/24/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 + sed -i -- 's/10.4.1.1/10.4.1.2/g' ./bundles.yaml + sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 10.4.9.0\/24/g' ./bundles.yaml ;; esac echo "... Deployment Started ...." - -#case openstack kilo with odl -juju-deployer -d -r 13 -c bundles.yaml trusty-"$2" +case "$1" in + 'nonha' ) + juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes + juju-deployer -vW -d -c bundles.yaml trusty-"$2" + ;; + 'ha' ) + juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes + juju-deployer -vW -d -c bundles.yaml trusty-"$2" + ;; + 'tip' ) + juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes + juju-deployer -vW -d -c bundles.yaml trusty-"$2" + ;; + * ) + juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes + juju-deployer -vW -d -c bundles.yaml trusty-"$2" + ;; +esac echo "... Deployment finished ...." -- cgit 1.2.3-korg