corrected typo and ident 51/3251/1
authorAuthor: Narinder Gupta <narinder.gupta@canonical.com>
Thu, 12 Nov 2015 14:41:59 +0000 (08:41 -0600)
committerNarinder Gupta <narinder.gupta@canonical.com>
Thu, 12 Nov 2015 14:43:26 +0000 (08:43 -0600)
 Author:    Author: Narinder Gupta <narinder.gupta@canonical.com>

Change-Id: I5d3d5ecc4e176d71d61b0a0708ee22a361a907a3

ci/odl/juju-deployer/ovs-odl-ha.yaml

index 740cb16..5f813ac 100644 (file)
@@ -155,7 +155,7 @@ openstack-phase2:
       branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/vpp
       options:
         overlay-network-type: 'vxlan gre'
-        security-groups: true
+        security-groups: True
     openvswitch-odl:
       branch: lp:~openstack-charmers/charms/trusty/openvswitch-odl/trunk
   relations:
@@ -184,11 +184,11 @@ openstack-phase2:
     - - "nova-cloud-controller:shared-db"
       - "percona-cluster:shared-db"
     - - "nova-cloud-controller:amqp"
-       - "rabbitmq-server:amqp"
+      - "rabbitmq-server:amqp"
     - - "nova-cloud-controller:image-service"
       - "glance:image-service"
-     - - "nova-cloud-controller:identity-service"
-       - "keystone:identity-service"
+    - - "nova-cloud-controller:identity-service"
+      - "keystone:identity-service"
     - - "nova-cloud-controller:cloud-compute"
       - "nova-compute:cloud-compute"
     - - "nova-compute:amqp"
@@ -197,26 +197,26 @@ openstack-phase2:
       - "glance:image-service"
     - - "glance:shared-db"
       - "percona-cluster:shared-db"
-     - - "glance:identity-service"
-       - "keystone:identity-service"
+    - - "glance:identity-service"
+      - "keystone:identity-service"
     - - "glance:amqp"
       - "rabbitmq-server:amqp"
     - - "openstack-dashboard:identity-service"
-       - "keystone:identity-service"
+      - "keystone:identity-service"
     - - "neutron-api:shared-db"
       - "percona-cluster:shared-db"
-     - - "neutron-api:amqp"
-       - "rabbitmq-server:amqp"
+    - - "neutron-api:amqp"
+      - "rabbitmq-server:amqp"
     - - "nova-cloud-controller:neutron-api"
       - "neutron-api:neutron-api"
     - - "neutron-api:identity-service"
       - "keystone:identity-service"
     - - "neutron-gateway:amqp"
       - "rabbitmq-server:amqp"
-     - - "neutron-gateway:neutron-plugin-api"
-       - "neutron-api:neutron-plugin-api"
-     - - "nova-cloud-controller:quantum-network-service"
-       - "neutron-gateway:quantum-network-service"
+    - - "neutron-gateway:neutron-plugin-api"
+      - "neutron-api:neutron-plugin-api"
+    - - "nova-cloud-controller:quantum-network-service"
+      - "neutron-gateway:quantum-network-service"
 trusty-liberty-nodes:
   inherits: openstack-phase1
   overrides: