modified to include the gatway mac as part of deployment.

Change-Id: I052dcc972d1a9381565b4576ac80aad4595c21ef
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
(cherry picked from commit cbc4db9cefe77a75f906e13d0d702af2b80df2ff)

diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh
index 86f8fb6..8036609 100755 (executable)
--- a/ci/01-deploybundle.sh
+++ b/ci/01-deploybundle.sh
@@ -35,6 +35,8 @@ case "$3" in
          sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 10.4.9.0\/24/g' ./bundles.yaml
         # Choose the external port to go out from gateway to use.
          sed -i -- 's/#ext-port: "eth1"/ext-port: "eth2"/g' ./bundles.yaml
+        # Provide the gateway MAC to route the traffic externally.
+         sed -i -- 's/#gateway-mac: "default"/gateway-mac: "default"/g' ./bundles.yaml
          ;;
      'intelpod5' )
         # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20
@@ -43,6 +45,8 @@ case "$3" in
          sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 10.4.9.0\/24/g' ./bundles.yaml
         # Choose the external port to go out from gateway to use.
          sed -i -- 's/#ext-port: "eth1"/ext-port: "eth2.724"/g' ./bundles.yaml
+        # Provide the gateway MAC to route the traffic externally.
+         sed -i -- 's/#gateway-mac: "default"/gateway-mac: "default"/g' ./bundles.yaml
         ;;
      'attvirpod1' )
         # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20

diff --git a/ci/onos/juju-deployer/ovs-onos-ha.yaml b/ci/onos/juju-deployer/ovs-onos-ha.yaml
index b59c3f8..8ad3b0e 100644 (file)
--- a/ci/onos/juju-deployer/ovs-onos-ha.yaml
+++ b/ci/onos/juju-deployer/ovs-onos-ha.yaml
@@ -212,6 +212,7 @@ openstack-phase2:
       branch: "lp:~wuwenbin2/onosfw/onos-controller"
       options:
         #ext-port: "eth1"
+        #gateway-mac: "default"
       to:
         - "lxc:nodes-api=1"
     glance:

diff --git a/ci/onos/juju-deployer/ovs-onos-nonha.yaml b/ci/onos/juju-deployer/ovs-onos-nonha.yaml
index eb0d74b..e00ba4b 100644 (file)
--- a/ci/onos/juju-deployer/ovs-onos-nonha.yaml
+++ b/ci/onos/juju-deployer/ovs-onos-nonha.yaml
@@ -149,6 +149,7 @@ openstack-phase2:
       branch: "lp:~wuwenbin2/onosfw/onos-controller"
       options:
         #ext-port: "eth1"
+        #gateway-mac: "default"
       to:
         - "lxc:nodes-api=0"
     glance:

diff --git a/ci/onos/juju-deployer/ovs-onos-tip.yaml b/ci/onos/juju-deployer/ovs-onos-tip.yaml
index 55525ef..dd00f2d 100644 (file)
--- a/ci/onos/juju-deployer/ovs-onos-tip.yaml
+++ b/ci/onos/juju-deployer/ovs-onos-tip.yaml
@@ -150,6 +150,7 @@ openstack-phase2:
       branch: "lp:~wuwenbin2/onosfw/onos-controller"
       options:
         #ext-port: "eth1"
+        #gateway-mac: "default"
       to:
         - "lxc:nodes-api=0"
     glance: