From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Mon, 14 Mar 2016 19:52:52 +0000 (-0500)
Subject: trying to match the cluster same as ODL and other feature.
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=10376c4a75ab0c84bd0cabb9fd256552d6d5133b;p=joid.git

trying to match the cluster same as ODL and other feature.

Change-Id: I23fe3a2e53b322464a90be10b55a47b63819adee
(cherry picked from commit d17dca276aa11bf8d72b339a6da0c1de1ff27d17)
---

diff --git a/ci/onos/juju-deployer/ovs-onos-ha.yaml b/ci/onos/juju-deployer/ovs-onos-ha.yaml
index 8ad3b0e4..9c80226c 100644
--- a/ci/onos/juju-deployer/ovs-onos-ha.yaml
+++ b/ci/onos/juju-deployer/ovs-onos-ha.yaml
@@ -184,6 +184,7 @@ openstack-phase2:
         network-manager: Neutron
         quantum-security-groups: "yes"
         service-guard: true
+        neutron-external-network: ext_net
         vip: 10.4.1.16
       to:
         - "lxc:nodes-api=1"
@@ -349,10 +350,12 @@ trusty-liberty-nodes:
 trusty-liberty:
   inherits: openstack-phase2
   overrides:
-    cluster_count: 3
+    #cluster_count: 3
     #os-data-network: 10.4.8.0/21
     #ceph-cluster-network: 10.4.0.0/21
     #prefer-ipv6: true
+    #enable-dvr: true
+    #l2-population: true
     region: Canonical
     source: "cloud:trusty-liberty"
     openstack-origin: "cloud:trusty-liberty"
@@ -369,10 +372,12 @@ trusty-kilo-nodes:
 trusty-kilo:
   inherits: openstack-phase2
   overrides:
-    cluster_count: 3
+    #cluster_count: 3
     #os-data-network: 10.4.8.0/21
     #ceph-cluster-network: 10.4.0.0/21
     #prefer-ipv6: true
+    #enable-dvr: true
+    #l2-population: true
     region: Canonical
     source: "cloud:trusty-kilo"
     openstack-origin: "cloud:trusty-kilo"
@@ -389,10 +394,12 @@ trusty-juno-nodes:
 trusty-juno:
   inherits: openstack-phase2
   overrides:
-    cluster_count: 3
+    #cluster_count: 3
     #os-data-network: 10.4.8.0/21
     #ceph-cluster-network: 10.4.0.0/21
     #prefer-ipv6: true
+    #enable-dvr: true
+    #l2-population: true
     region: Canonical
     source: "cloud:trusty-juno"
     openstack-origin: "cloud:trusty-juno"