diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2015-11-07 00:38:58 -0600 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2015-11-07 00:42:36 -0600 |
| commit | 3ff5b9114e07349bb4a4b5578394bd799950dcf6 (patch) | |
| tree | bf19af5d90f4a343218b8e260fa20638d2057357 /ci/odl | |
| parent | ebefaf35b2909bcc41d8ba3917228b7ccba7ce2e (diff) | |
added ubuntu charm for local deployment charm to configure the
network according to the labs.
Change-Id: I103b6dc243f025a4916d1057c247d01ee8f175ee
Diffstat (limited to 'ci/odl')
| -rwxr-xr-x | ci/odl/01-deploybundle.sh | 46 | ||||
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl-ha.yaml | 10 |
2 files changed, 33 insertions, 23 deletions
diff --git a/ci/odl/01-deploybundle.sh b/ci/odl/01-deploybundle.sh index 4fdfe808..fee0a515 100755 --- a/ci/odl/01-deploybundle.sh +++ b/ci/odl/01-deploybundle.sh @@ -19,39 +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/os-data-network/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/os-data-network/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 "$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 - case "$3" in - 'orangepod2' ) - juju run --service nodes-api 'sudo ifup eth3' - juju run --service nodes-compute 'sudo ifup eth5' - ;; - 'intelpod6' ) - juju run --service nodes-api 'sudo ifup eth1' - juju run --service nodes-compute 'sudo ifup eth1' - ;; - 'intelpod5' ) - juju run --service nodes-api 'sudo ifup eth1' - juju run --service nodes-compute 'sudo ifup eth1' - ;; - esac + 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 -juju-deployer -vW -d -c bundles.yaml trusty-"$2" - echo "... Deployment finished ...." diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml index 35372d68..27a10d6f 100644 --- a/ci/odl/juju-deployer/ovs-odl-ha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml @@ -3,11 +3,11 @@ openstack-phase1: series: trusty services: nodes-api: - branch: "lp:charms/trusty/ubuntu" + charm: "local:trusty/ubuntu-nodes-controller" num_units: 3 constraints: tags=control nodes-compute: - branch: "lp:charms/trusty/ubuntu" + charm: "local:trusty/ubuntu-nodes-compute" num_units: 1 constraints: tags=compute "ntp": @@ -132,7 +132,7 @@ openstack-phase2: # num_units: 3 # constraints: tags=gateway options: -# "ext-port": eth1 +# "ext-port": "eth1" plugin: ovs-odl # instance-mtu: 1400 to: @@ -141,9 +141,9 @@ openstack-phase2: branch: lp:~narindergupta/charms/trusty/odl-controller/liberty options: install-url: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.4-Helium-SR4/distribution-karaf-0.2.4-Helium-SR4.tar.gz" - # to: lxc:nodes-api=1 +# install-url: "https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.3.2-Lithium-SR2/distribution-karaf-0.3.2-Lithium-SR2.tar.gz" to: - - "nodes-api=0" + - "lxc:nodes-api=1" "glance": charm: "cs:trusty/glance" num_units: 3 |