summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-03-02 13:56:31 -0600
committerNarinder Gupta <narinder.gupta@canonical.com>2016-03-16 13:34:38 +0000
commit467c0afd120451f741189b12a9e1f39c4a37ca78 (patch)
treeaf7cbfa306378c818ff726eade8f4bd35008a27a
parent9a1a43ef022265e0e8d5f3f4577c1480161ce246 (diff)
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)
-rwxr-xr-xci/01-deploybundle.sh4
-rw-r--r--ci/onos/juju-deployer/ovs-onos-ha.yaml1
-rw-r--r--ci/onos/juju-deployer/ovs-onos-nonha.yaml1
-rw-r--r--ci/onos/juju-deployer/ovs-onos-tip.yaml1
4 files changed, 7 insertions, 0 deletions
diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh
index 86f8fb6a..80366094 100755
--- 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 b59c3f89..8ad3b0e4 100644
--- 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 eb0d74b5..e00ba4b8 100644
--- 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 55525ef2..dd00f2de 100644
--- 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: