From 9ce694312fe725a5ae42735f79d1408eca425ed3 Mon Sep 17 00:00:00 2001
From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Tue, 10 May 2016 15:26:28 -0600
Subject: modfieid to include mitaka support with xenial

Change-Id: I39c760cff8db709237ff73f83bfce41e58ecfcb1
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
---
 ci/odl/juju-deployer/ovs-odl-ha.yaml    | 7 +++----
 ci/odl/juju-deployer/ovs-odl-nonha.yaml | 7 +++----
 ci/odl/juju-deployer/ovs-odl-tip.yaml   | 7 +++----
 3 files changed, 9 insertions(+), 12 deletions(-)

(limited to 'ci/odl/juju-deployer')

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
-- 
cgit 1.2.3-korg