diff options
author | Narinder Gupta <narinder.gupta@canonical.com> | 2016-05-10 15:26:28 -0600 |
---|---|---|
committer | Narinder Gupta <narinder.gupta@canonical.com> | 2016-05-10 15:27:08 -0600 |
commit | 9ce694312fe725a5ae42735f79d1408eca425ed3 (patch) | |
tree | 514bae8c84f083bd2f3e481a67dd34d1597897b1 /ci/odl/juju-deployer | |
parent | 156cd84490ff3a421530032a0a0a6f2b05676ecf (diff) |
modfieid to include mitaka support with xenial
Change-Id: I39c760cff8db709237ff73f83bfce41e58ecfcb1
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/odl/juju-deployer')
-rw-r--r-- | ci/odl/juju-deployer/ovs-odl-ha.yaml | 7 | ||||
-rw-r--r-- | ci/odl/juju-deployer/ovs-odl-nonha.yaml | 7 | ||||
-rw-r--r-- | ci/odl/juju-deployer/ovs-odl-tip.yaml | 7 |
3 files changed, 9 insertions, 12 deletions
diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml index 67fec0d2..7324224d 100644 --- a/ci/odl/juju-deployer/ovs-odl-ha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml @@ -11,7 +11,7 @@ openstack-phase1: num_units: 2 constraints: tags=compute ntp: - charm: "cs:trusty/ntp" + charm: "local:trusty/ntp" relations: - - "ntp:juju-info" - "nodes-api:juju-info" @@ -82,7 +82,7 @@ openstack-phase2: ceilometer-agent: charm: "local:trusty/ceilometer-agent" mongodb: - charm: "cs:trusty/mongodb" + charm: "local:trusty/mongodb" num_units: 1 to: - "lxc:nodes-api=0" @@ -244,7 +244,6 @@ openstack-phase2: - "lxc:nodes-api=2" opnfv-promise: branch: lp:~narindergupta/charms/trusty/promise/trunk - num_units: 1 to: - "lxc:nodes-api=2" neutron-api-odl: @@ -442,7 +441,7 @@ trusty-mitaka: #l2-population: true #ext-port: "eth1" region: Canonical - source: "cloud:trusty-mitaka" + #source: "cloud:trusty-mitaka" openstack-origin: "cloud:trusty-mitaka" series: trusty ceph-osd-replication-count: 2 diff --git a/ci/odl/juju-deployer/ovs-odl-nonha.yaml b/ci/odl/juju-deployer/ovs-odl-nonha.yaml index 9220f84f..dca43281 100644 --- a/ci/odl/juju-deployer/ovs-odl-nonha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-nonha.yaml @@ -11,7 +11,7 @@ openstack-phase1: num_units: 2 constraints: tags=compute ntp: - charm: "cs:trusty/ntp" + charm: "local:trusty/ntp" relations: - - "ntp:juju-info" - "nodes-api:juju-info" @@ -36,7 +36,7 @@ openstack-phase2: ceilometer-agent: charm: "local:trusty/ceilometer-agent" mongodb: - charm: "cs:trusty/mongodb" + charm: "local:trusty/mongodb" num_units: 1 to: - "lxc:nodes-api=0" @@ -162,7 +162,6 @@ openstack-phase2: - "lxc:nodes-api=0" opnfv-promise: branch: lp:~narindergupta/charms/trusty/promise/trunk - num_units: 1 to: - "lxc:nodes-api=0" neutron-api-odl: @@ -279,7 +278,7 @@ trusty-mitaka: #l2-population: true #ext-port: "eth1" region: Canonical - source: "cloud:trusty-mitaka" + #source: "cloud:trusty-mitaka" openstack-origin: "cloud:trusty-mitaka" series: trusty ceph-osd-replication-count: 2 diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml index 8c309c54..d9b71170 100644 --- a/ci/odl/juju-deployer/ovs-odl-tip.yaml +++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml @@ -11,7 +11,7 @@ openstack-phase1: num_units: 2 constraints: tags=compute ntp: - charm: "cs:trusty/ntp" + charm: "local:trusty/ntp" relations: - - "ntp:juju-info" - "nodes-api:juju-info" @@ -36,7 +36,7 @@ openstack-phase2: ceilometer-agent: charm: "local:trusty/ceilometer-agent" mongodb: - charm: "cs:trusty/mongodb" + charm: "local:trusty/mongodb" num_units: 1 to: - "lxc:nodes-api=0" @@ -164,7 +164,6 @@ openstack-phase2: - "lxc:nodes-api=0" opnfv-promise: branch: lp:~narindergupta/charms/trusty/promise/trunk - num_units: 1 to: - "lxc:nodes-api=0" neutron-api-odl: @@ -281,7 +280,7 @@ trusty-mitaka: #l2-population: true #ext-port: "eth1" region: Canonical - source: "cloud:trusty-mitaka" + #source: "cloud:trusty-mitaka" openstack-origin: "cloud:trusty-mitaka" series: trusty ceph-osd-replication-count: 2 |