modified to include the gatway mac as part of deployment. 45/10945/1
authorNarinder Gupta <narinder.gupta@canonical.com>
Wed, 2 Mar 2016 19:56:31 +0000 (13:56 -0600)
committerNarinder Gupta <narinder.gupta@canonical.com>
Wed, 2 Mar 2016 19:56:31 +0000 (13:56 -0600)
Change-Id: I052dcc972d1a9381565b4576ac80aad4595c21ef
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
ci/01-deploybundle.sh
ci/onos/juju-deployer/ovs-onos-ha.yaml
ci/onos/juju-deployer/ovs-onos-nonha.yaml
ci/onos/juju-deployer/ovs-onos-tip.yaml

index 86f8fb6..8036609 100755 (executable)
@@ -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
index b59c3f8..8ad3b0e 100644 (file)
@@ -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:
index c3c1941..e32b810 100644 (file)
@@ -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:
index 55daca8..91832ac 100644 (file)
@@ -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: