From f27f64a537b51c35979cef258e933fad5330fc52 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Mon, 11 Jan 2016 18:06:18 -0600 Subject: ymodified to include the changes needed for MAAS 1.9 Change-Id: Ia7638dda099342bb65b89cddb90813a66aa53d08 --- ci/opencontrail/01-deploybundle.sh | 15 --------------- ci/opencontrail/juju-deployer/contrail-ha.yaml | 4 ++-- ci/opencontrail/juju-deployer/contrail-tip.yaml | 4 ++-- ci/opencontrail/juju-deployer/contrail.yaml | 4 ++-- 4 files changed, 6 insertions(+), 21 deletions(-) (limited to 'ci/opencontrail') diff --git a/ci/opencontrail/01-deploybundle.sh b/ci/opencontrail/01-deploybundle.sh index ea8290a1..4c1f5d5c 100755 --- a/ci/opencontrail/01-deploybundle.sh +++ b/ci/opencontrail/01-deploybundle.sh @@ -21,10 +21,6 @@ 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 # 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/192.168.2.2/g' ./bundles.yaml # choose the correct interface to use for data network @@ -33,9 +29,6 @@ case "$3" in sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth1"/g' ./bundles.yaml ;; 'intelpod6' ) - # 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 @@ -44,9 +37,6 @@ case "$3" in sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth2"/g' ./bundles.yaml ;; 'intelpod5' ) - # 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 @@ -55,17 +45,12 @@ case "$3" in sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth2.724"/g' ./bundles.yaml ;; 'attvirpod1' ) - # 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 # 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/192.168.10.1/g' ./bundles.yaml # Choose the external port to go out from gateway to use. sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth1"/g' ./bundles.yaml ;; 'default' ) - 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 sed -i -- 's/10.4.1.1/192.168.122.1/g' ./bundles.yaml sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth1"/g' ./bundles.yaml ;; diff --git a/ci/opencontrail/juju-deployer/contrail-ha.yaml b/ci/opencontrail/juju-deployer/contrail-ha.yaml index 907fe928..1c70e73d 100644 --- a/ci/opencontrail/juju-deployer/contrail-ha.yaml +++ b/ci/opencontrail/juju-deployer/contrail-ha.yaml @@ -3,11 +3,11 @@ openstack-phase1: series: trusty services: nodes-api: - charm: "local:trusty/ubuntu-nodes-controller" + charm: "cs:trusty/ubuntu" num_units: 3 constraints: tags=control nodes-compute: - charm: "local:trusty/ubuntu-nodes-compute" + charm: "cs:trusty/ubuntu" num_units: 2 constraints: tags=compute "ntp": diff --git a/ci/opencontrail/juju-deployer/contrail-tip.yaml b/ci/opencontrail/juju-deployer/contrail-tip.yaml index da32c8fa..ca7ad4ae 100644 --- a/ci/opencontrail/juju-deployer/contrail-tip.yaml +++ b/ci/opencontrail/juju-deployer/contrail-tip.yaml @@ -3,11 +3,11 @@ openstack-phase1: series: trusty services: nodes-api: - charm: "local:trusty/ubuntu-nodes-controller" + charm: "cs:trusty/ubuntu" num_units: 1 constraints: tags=control nodes-compute: - charm: "local:trusty/ubuntu-nodes-compute" + charm: "cs:trusty/ubuntu" num_units: 1 constraints: tags=compute "ntp": diff --git a/ci/opencontrail/juju-deployer/contrail.yaml b/ci/opencontrail/juju-deployer/contrail.yaml index ec58c058..f01d68eb 100644 --- a/ci/opencontrail/juju-deployer/contrail.yaml +++ b/ci/opencontrail/juju-deployer/contrail.yaml @@ -3,11 +3,11 @@ openstack-phase1: series: trusty services: nodes-api: - charm: "local:trusty/ubuntu-nodes-controller" + charm: "cs:trusty/ubuntu" num_units: 1 constraints: tags=control nodes-compute: - charm: "local:trusty/ubuntu-nodes-compute" + charm: "cs:trusty/ubuntu" num_units: 1 constraints: tags=compute "ntp": -- cgit 1.2.3-korg