joid: clean deployment files

Change-Id: I98115c2f15cd399a371fa63d974f3200750e0949
Signed-off-by: David Blaisonneau <david.blaisonneau@orange.com>
(cherry picked from commit af0e297456a0646ea6d3e14cc63cb4a199dac506)

1 files changed, 17 insertions, 17 deletions

diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml
index cf621401..be33b98c 100644
--- a/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml
@@ -10,7 +10,7 @@ openstack-phase1:
       charm: "cs:trusty/ubuntu"
       num_units: 1
       constraints: tags=compute
-    "ntp":
+    ntp:
       charm: "cs:trusty/ntp"
     zookeeper:
       branch: lp:~charmers/charms/precise/zookeeper/trunk
@@ -31,25 +31,25 @@ openstack-phase1:
 openstack-phase2:
   inherits: openstack-phase1
   services:
-    "mysql":
+    mysql:
       branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next"
       num_units: 1
       options:
-        "dataset-size": 2G
-        "max-connections": 10000
+        dataset-size: 2G
+        max-connections: 10000
       to:
         - "lxc:nodes-api=0"
-    "mongodb":
+    mongodb:
       charm: "cs:trusty/mongodb"
       num_units: 1
       to:
         - "lxc:nodes-api=0"
-    "ceilometer":
+    ceilometer:
       branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next"
       num_units: 1
       to:
         - "lxc:nodes-api=0"
-    "ceilometer-agent":
+    ceilometer-agent:
       branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next"
     heat:
       branch: "lp:~openstack-charmers/charms/trusty/heat/next"
@@ -94,21 +94,21 @@ openstack-phase2:
         - "lxc:nodes-api=0"
     cinder-ceph:
       branch: "lp:~openstack-charmers/charms/trusty/cinder-ceph/next"
-    "rabbitmq-server":
+    rabbitmq-server:
       branch: lp:~openstack-charmers/charms/trusty/rabbitmq-server/next
       num_units: 1
       to:
         - "lxc:nodes-api=0"
-    "keystone":
+    keystone:
       branch: lp:~openstack-charmers/charms/trusty/keystone/next
       num_units: 1
       options:
         openstack-origin-git: include-file://keystone-master.yaml
         admin-password: openstack
-        "admin-token": admin
+        admin-token: admin
       to:
         - "lxc:nodes-api=0"
-    "openstack-dashboard":
+    openstack-dashboard:
       branch: lp:~openstack-charmers/charms/trusty/openstack-dashboard/next
       num_units: 1
       options:
@@ -117,31 +117,31 @@ openstack-phase2:
         webroot: /
       to:
         - "lxc:nodes-api=0"
-    "nova-compute":
+    nova-compute:
       branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
       num_units: 1
       options:
         openstack-origin-git: include-file://nova-master.yaml
-        "manage-neutron-plugin-legacy-mode": False
+        manage-neutron-plugin-legacy-mode: False
       to:
         - "nodes-compute=0"
 #        - "nodes-compute=1"
-    "nova-cloud-controller":
+    nova-cloud-controller:
       branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next
       num_units: 1
       options:
         openstack-origin-git: include-file://nova-master.yaml
-        "network-manager": Neutron
+        network-manager: Neutron
       to:
         - "lxc:nodes-api=0"
-    "neutron-api":
+    neutron-api:
       branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
       num_units: 1
       options:
         manage-neutron-plugin-legacy-mode: False
       to:
         - "lxc:nodes-api=0"
-    "glance":
+    glance:
       branch: lp:~openstack-charmers/charms/trusty/glance/next
       num_units: 1
       options: