diff options
| author |   David Blaisonneau <david.blaisonneau@orange.com> | 2016-01-28 16:19:39 +0100 |
|---|---|---|
| committer |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-01-29 03:45:38 +0000 |
| commit | 4dcd9cf1a23df3eab9821c2de0271cb1a514d463 (patch) | |
| tree | 9bac4f5b8fc39bab469d9a8370f632974a08a7aa /ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml | |
| parent | 0af6211ff740a032b226ec99b138d996ddafcaed (diff) | |
joid: clean deployment files
Change-Id: I98115c2f15cd399a371fa63d974f3200750e0949
Signed-off-by: David Blaisonneau <david.blaisonneau@orange.com>
(cherry picked from commit af0e297456a0646ea6d3e14cc63cb4a199dac506)
Diffstat (limited to 'ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml')
| -rw-r--r-- | ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml index f22bd535..2df32d7f 100644 --- a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml +++ b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml @@ -10,7 +10,7 @@ openstack-phase1: charm: "cs:trusty/ubuntu" num_units: 2 constraints: tags=compute - "ntp": + ntp: charm: "cs:trusty/ntp" relations: - - "ntp:juju-info" @@ -134,7 +134,7 @@ openstack-phase2: branch: "lp:~openstack-charmers/charms/trusty/neutron-gateway/next" num_units: 1 options: -# "ext-port": "eth1" +# ext-port: "eth1" instance-mtu: 1400 to: - "nodes-api=0" @@ -328,7 +328,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: 2 admin-role: admin @@ -347,7 +347,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: 2 admin-role: admin @@ -366,7 +366,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: 2 admin-role: admin |