From af0e297456a0646ea6d3e14cc63cb4a199dac506 Mon Sep 17 00:00:00 2001 From: David Blaisonneau Date: Thu, 28 Jan 2016 16:19:39 +0100 Subject: joid: clean deployment files Change-Id: I98115c2f15cd399a371fa63d974f3200750e0949 Signed-off-by: David Blaisonneau --- ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml') diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml index 3be7e824..1d14b5b5 100644 --- a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml +++ b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml @@ -10,7 +10,7 @@ openstack-phase1: charm: "cs:trusty/ubuntu" num_units: 1 constraints: tags=compute - "ntp": + ntp: charm: "cs:trusty/ntp" relations: - - "ntp:juju-info" @@ -113,7 +113,7 @@ openstack-phase2: num_units: 1 options: instance-mtu: 1400 -# "ext-port": "eth1" +# ext-port: "eth1" to: - "nodes-api=0" neutron-openvswitch: @@ -262,7 +262,7 @@ trusty-liberty: #prefer-ipv6: true region: Canonical source: "cloud:trusty-liberty" - "openstack-origin": "cloud:trusty-liberty" + openstack-origin: "cloud:trusty-liberty" series: trusty ceph-osd-replication-count: 1 admin-role: admin @@ -281,7 +281,7 @@ trusty-kilo: #prefer-ipv6: true region: Canonical source: "cloud:trusty-kilo" - "openstack-origin": "cloud:trusty-kilo" + openstack-origin: "cloud:trusty-kilo" series: trusty ceph-osd-replication-count: 1 admin-role: admin @@ -300,7 +300,7 @@ trusty-juno: #prefer-ipv6: true region: Canonical source: "cloud:trusty-juno" - "openstack-origin": "cloud:trusty-juno" + openstack-origin: "cloud:trusty-juno" series: trusty ceph-osd-replication-count: 1 admin-role: admin -- cgit 1.2.3-korg