added support for att virtual pod1 on Intel NUC. Also added support

of IPv6 based on invocation of IPV6.

Change-Id: I6876cff12e25fd9f05b15815d4ac72ce84a78997

4 files changed, 19 insertions, 0 deletions

diff --git a/ci/opencontrail/01-deploybundle.sh b/ci/opencontrail/01-deploybundle.sh
index 71725110..f9268b69 100755
--- a/ci/opencontrail/01-deploybundle.sh
+++ b/ci/opencontrail/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/virpod1/lxc-add-more-interfaces trusty/ubuntu-nodes-controller/lxc/add-more-interfaces
+         cp maas/att/virpod1/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/opencontrail/juju-deployer/contrail-ha.yaml b/ci/opencontrail/juju-deployer/contrail-ha.yaml
index c6ce1bf8..cbe6b660 100644
--- a/ci/opencontrail/juju-deployer/contrail-ha.yaml
+++ b/ci/opencontrail/juju-deployer/contrail-ha.yaml
@@ -343,6 +343,7 @@ trusty-liberty:
   overrides:
     series: trusty
     #os-data-network: 10.4.8.0/21
+    #prefer-ipv6: true
     region: Canonical
     openstack-origin: cloud:trusty-liberty
     source: "cloud:trusty-liberty"
@@ -360,6 +361,7 @@ trusty-kilo:
   overrides:
     series: trusty
     #os-data-network: 10.4.8.0/21
+    #prefer-ipv6: true
     region: Canonical
     openstack-origin: cloud:trusty-kilo
     source: "cloud:trusty-kilo"
@@ -376,6 +378,7 @@ trusty-juno:
   overrides:
     series: trusty
     #os-data-network: 10.4.8.0/21
+    #prefer-ipv6: true
     region: Canonical
     openstack-origin: cloud:trusty-juno
     source: "cloud:trusty-juno"
diff --git a/ci/opencontrail/juju-deployer/contrail-tip.yaml b/ci/opencontrail/juju-deployer/contrail-tip.yaml
index e881c29b..a329dc6f 100644
--- a/ci/opencontrail/juju-deployer/contrail-tip.yaml
+++ b/ci/opencontrail/juju-deployer/contrail-tip.yaml
@@ -247,6 +247,7 @@ trusty-liberty:
   overrides:
     series: trusty
     #os-data-network: 10.4.8.0/21
+    #prefer-ipv6: true
     region: Canonical
     openstack-origin: cloud:trusty-liberty
     source: "cloud:trusty-liberty"
@@ -269,6 +270,7 @@ trusty-kilo:
   overrides:
     series: trusty
     #os-data-network: 10.4.8.0/21
+    #prefer-ipv6: true
     region: Canonical
     openstack-origin: cloud:trusty-kilo
     source: "cloud:trusty-kilo"
@@ -291,6 +293,7 @@ trusty-juno:
   overrides:
     series: trusty
     #os-data-network: 10.4.8.0/21
+    #prefer-ipv6: true
     region: Canonical
     openstack-origin: cloud:trusty-juno
     source: "cloud:trusty-juno"
diff --git a/ci/opencontrail/juju-deployer/contrail.yaml b/ci/opencontrail/juju-deployer/contrail.yaml
index 6e46daec..c9770df7 100644
--- a/ci/opencontrail/juju-deployer/contrail.yaml
+++ b/ci/opencontrail/juju-deployer/contrail.yaml
@@ -241,6 +241,7 @@ trusty-liberty:
   overrides:
     series: trusty
     #os-data-network: 10.4.8.0/21
+    #prefer-ipv6: true
     region: Canonical
     openstack-origin: cloud:trusty-liberty
     source: "cloud:trusty-liberty"
@@ -263,6 +264,7 @@ trusty-kilo:
   overrides:
     series: trusty
     #os-data-network: 10.4.8.0/21
+    #prefer-ipv6: true
     region: Canonical
     openstack-origin: cloud:trusty-kilo
     source: "cloud:trusty-kilo"
@@ -285,6 +287,7 @@ trusty-juno:
   overrides:
     series: trusty
     #os-data-network: 10.4.8.0/21
+    #prefer-ipv6: true
     region: Canonical
     openstack-origin: cloud:trusty-juno
     source: "cloud:trusty-juno"