From ac30ba09418bd15ecf9f08c0eda9f2bc376f0930 Mon Sep 17 00:00:00 2001
From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Wed, 8 Jun 2016 08:21:06 -0500
Subject: modified for wrong charm metadata

Change-Id: I3d544990b718f31a90019453dbcc95cee27aeaa4
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
---
 .../juju-deployer/ovs-opencontrail-ha.yaml         | 25 +++++++++++-----------
 1 file changed, 12 insertions(+), 13 deletions(-)

(limited to 'ci/opencontrail')

diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
index ac0f03d9..99936e76 100644
--- a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
@@ -37,13 +37,13 @@ openstack-phase1:
       - "nodes-api:juju-info"
     - - "ntp:juju-info"
       - "nodes-compute:juju-info"
-openstack-phase2: 
+openstack-phase2:
   inherits: openstack-phase1
-  services: 
-    percona-cluster: 
+  services:
+    percona-cluster:
       branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next"
       num_units: 3
-      options: 
+      options:
         dataset-size: 2G
         lp1366997-workaround: true
         max-connections: 10000
@@ -179,10 +179,10 @@ openstack-phase2:
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
         - "lxc:nodes-api=2"
-    nova-compute: 
+    nova-compute:
       branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
       num_units: 2
-      options: 
+      options:
         enable-live-migration: False
         manage-neutron-plugin-legacy-mode: False
       to:
@@ -191,34 +191,33 @@ openstack-phase2:
 #        - "nodes-api=0"
 #        - "nodes-api=1"
 #        - "nodes-api=2"
-    nova-cloud-controller: 
+    nova-cloud-controller:
       branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next
       num_units: 3
-      options: 
+      options:
         console-access-protocol: novnc
         network-manager: Neutron
         service-guard: true
-        neutron-external-network: ext_net
         vip: 10.4.1.16
       to:
         - "lxc:nodes-api=1"
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=2"
-    neutron-api: 
+    neutron-api:
       branch: lp:~opnfv-team/charms/trusty/neutron-api/next
       num_units: 3
       options:
         neutron-security-groups: True
         manage-neutron-plugin-legacy-mode: False
         vip: 10.4.1.17
-      to: 
+      to:
         - "lxc:nodes-api=2"
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
-    glance: 
+    glance:
       branch: lp:~openstack-charmers/charms/trusty/glance/next
       num_units: 3
-      options: 
+      options:
         vip: 10.4.1.12
       to:
         - "lxc:nodes-api=1"
-- 
cgit 1.2.3-korg