From cb5a719425069adfbf539260fa422c1aa1404004 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Mon, 30 Nov 2015 20:56:38 -0600 Subject: added support for att virtual pod1 on Intel NUC. Also added support of IPv6 based on invocation of IPV6. Change-Id: I6876cff12e25fd9f05b15815d4ac72ce84a78997 --- ci/odl/01-deploybundle.sh | 10 ++++++++++ ci/odl/juju-deployer/ovs-odl-ha.yaml | 3 +++ ci/odl/juju-deployer/ovs-odl-tip.yaml | 2 ++ ci/odl/juju-deployer/ovs-odl.yaml | 3 +++ 4 files changed, 18 insertions(+) (limited to 'ci/odl') diff --git a/ci/odl/01-deploybundle.sh b/ci/odl/01-deploybundle.sh index 707eac06..15ff77b1 100755 --- a/ci/odl/01-deploybundle.sh +++ b/ci/odl/01-deploybundle.sh @@ -56,6 +56,16 @@ case "$3" in # Choose the external port to go out from gateway to use. 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/airpod1/lxc-add-more-interfaces trusty/ubuntu-nodes-controller/lxc/add-more-interfaces + cp maas/att/airpod1/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.1.1/g' ./bundles.yaml + # Choose the external port to go out from gateway to use. + sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "juju-br0"/g' ./bundles.yaml + ;; esac echo "... Deployment Started ...." diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml index 20837260..f973f0cb 100644 --- a/ci/odl/juju-deployer/ovs-odl-ha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml @@ -334,6 +334,7 @@ trusty-liberty: overrides: cluster_count: 3 #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true region: Canonical source: "cloud:trusty-liberty" "openstack-origin": "cloud:trusty-liberty" @@ -350,6 +351,7 @@ trusty-kilo: overrides: cluster_count: 3 #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true region: Canonical source: "cloud:trusty-kilo" "openstack-origin": "cloud:trusty-kilo" @@ -367,6 +369,7 @@ trusty-juno: overrides: cluster_count: 3 #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true region: Canonical source: "cloud:trusty-juno" "openstack-origin": "cloud:trusty-juno" diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml index 0b880c91..3066ef3c 100644 --- a/ci/odl/juju-deployer/ovs-odl-tip.yaml +++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml @@ -262,6 +262,7 @@ trusty-liberty: inherits: openstack-phase2 overrides: #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true region: Canonical source: "cloud:trusty-liberty" "openstack-origin": "cloud:trusty-liberty" @@ -280,6 +281,7 @@ trusty-kilo: overrides: region: Canonical #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true openstack-origin: cloud:trusty-kilo source: cloud:trusty-kilo series: trusty diff --git a/ci/odl/juju-deployer/ovs-odl.yaml b/ci/odl/juju-deployer/ovs-odl.yaml index 17ca1183..0ab46c76 100644 --- a/ci/odl/juju-deployer/ovs-odl.yaml +++ b/ci/odl/juju-deployer/ovs-odl.yaml @@ -259,6 +259,7 @@ trusty-liberty: inherits: openstack-phase2 overrides: #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true region: Canonical source: "cloud:trusty-liberty" "openstack-origin": "cloud:trusty-liberty" @@ -274,6 +275,7 @@ trusty-kilo: inherits: openstack-phase2 overrides: #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true region: Canonical source: "cloud:trusty-kilo" "openstack-origin": "cloud:trusty-kilo" @@ -290,6 +292,7 @@ trusty-juno: inherits: openstack-phase2 overrides: #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true region: Canonical source: "cloud:trusty-juno" "openstack-origin": "cloud:trusty-juno" -- cgit 1.2.3-korg