summaryrefslogtreecommitdiffstats
path: root/ci/nosdn/juju-deployer
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-05-10 15:26:28 -0600
committerNarinder Gupta <narinder.gupta@canonical.com>2016-05-10 15:27:08 -0600
commit9ce694312fe725a5ae42735f79d1408eca425ed3 (patch)
tree514bae8c84f083bd2f3e481a67dd34d1597897b1 /ci/nosdn/juju-deployer
parent156cd84490ff3a421530032a0a0a6f2b05676ecf (diff)
modfieid to include mitaka support with xenial
Change-Id: I39c760cff8db709237ff73f83bfce41e58ecfcb1 Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/nosdn/juju-deployer')
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml7
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml8
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml7
3 files changed, 9 insertions, 13 deletions
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
index 20846302..91c55ea3 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-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"
@@ -87,7 +87,6 @@ openstack-phase2:
- "lxc:nodes-api=1"
opnfv-promise:
charm: local:trusty/promise
- num_units: 1
to:
- "lxc:nodes-api=2"
keystone:
@@ -103,7 +102,7 @@ openstack-phase2:
- "lxc:nodes-api=1"
- "lxc:nodes-api=2"
mongodb:
- charm: cs:trusty/mongodb
+ charm: local:trusty/mongodb
num_units: 1
to:
- "lxc:nodes-api=0"
@@ -331,7 +330,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/nosdn/juju-deployer/ovs-nosdn-nonha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
index b078b302..f4e73bbc 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-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"
@@ -79,7 +79,6 @@ openstack-phase2:
- "lxc:nodes-api=0"
opnfv-promise:
charm: local:trusty/promise
- num_units: 1
to:
- "lxc:nodes-api=0"
keystone:
@@ -92,8 +91,7 @@ openstack-phase2:
to:
- "lxc:nodes-api=0"
mongodb:
- charm: cs:trusty/mongodb
- num_units: 1
+ charm: local:trusty/mongodb
to:
- "lxc:nodes-api=0"
mysql:
@@ -267,7 +265,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/nosdn/juju-deployer/ovs-nosdn-tip.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
index e8c560bf..ce2f25df 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-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"
@@ -155,7 +155,6 @@ openstack-phase2:
- "lxc:nodes-api=0"
opnfv-promise:
charm: local:trusty/promise
- num_units: 1
to:
- "lxc:nodes-api=0"
neutron-openvswitch:
@@ -265,7 +264,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