From 4cc6cd00d58611154d5d98b4ba86a4d36844507c Mon Sep 17 00:00:00 2001
From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Tue, 26 Jan 2016 14:06:01 -0600
Subject: mofidied the bundles to use the latest charms from next branch.

Change-Id: I887bf5d62899fb4efcfc7ec19376f8722f6e1528
(cherry picked from commit 1596207a399591aacfa8ac03a1718cb56b0ad5bb)
---
 .../juju-deployer/ovs-opencontrail-nonha.yaml      | 38 +++++++---------------
 1 file changed, 12 insertions(+), 26 deletions(-)

(limited to 'ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml')

diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml
index 7fb81075..ef6a8cea 100644
--- a/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml
@@ -32,7 +32,7 @@ openstack-phase2:
   inherits: openstack-phase1
   services:
     "mysql":
-      charm: "cs:trusty/mysql"
+      branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next"
       num_units: 1
       options:
         "dataset-size": 2G
@@ -56,7 +56,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     ceph:
-      charm: cs:trusty/ceph
+      branch: "lp:~openstack-charmers/charms/trusty/ceph/next"
       num_units: 1
       options:
         fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
@@ -69,7 +69,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     ceph-osd:
-      charm: cs:trusty/ceph-osd
+      branch: "lp:~openstack-charmers/charms/trusty/ceph-osd/next"
       num_units: 1
       options:
         osd-devices: /srv
@@ -77,14 +77,15 @@ openstack-phase2:
       to:
         - "nodes-compute=0"
     ceph-radosgw:
-      charm: cs:trusty/ceph-radosgw
+      branch: lp:~openstack-charmers/charms/trusty/ceph-radosgw/next
       num_units: 1
       options:
         use-embedded-webserver: true
+        operator-roles: "Member,admin"
       to:
         - "lxc:nodes-api=0"
     cinder:
-      charm: cs:trusty/cinder
+      branch: lp:~openstack-charmers/charms/trusty/cinder/next
       num_units: 1
       options:
         block-device: None
@@ -93,14 +94,14 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     cinder-ceph:
-      charm: cs:trusty/cinder-ceph
+      branch: lp:~openstack-charmers/charms/trusty/cinder-ceph/next
     "rabbitmq-server":
-      branch: lp:charms/trusty/rabbitmq-server
+      branch: lp:~openstack-charmers/charms/trusty/rabbitmq-server/next
       num_units: 1
       to:
         - "lxc:nodes-api=0"
     "keystone":
-      branch: lp:charms/trusty/keystone
+      branch: lp:~openstack-charmers/charms/trusty/keystone/next
       num_units: 1
       options:
         "admin-password": openstack
@@ -108,7 +109,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     "openstack-dashboard":
-      branch: lp:charms/trusty/openstack-dashboard
+      branch: lp:~openstack-charmers/charms/trusty/openstack-dashboard/next
       num_units: 1
       options:
         secret: admin
@@ -124,7 +125,7 @@ openstack-phase2:
         - "nodes-compute=0"
 #        - "nodes-compute=1"
     "nova-cloud-controller":
-      branch: lp:charms/trusty/nova-cloud-controller
+      branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next
       num_units: 1
       options:
         "network-manager": Neutron
@@ -138,7 +139,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     "glance":
-      branch: lp:charms/trusty/glance
+      branch: lp:~openstack-charmers/charms/trusty/glance/next
       num_units: 1
       to:
         - "lxc:nodes-api=0"
@@ -240,11 +241,6 @@ trusty-liberty-nodes:
 trusty-liberty:
   inherits: contrail
   series: trusty
-  services:
-    mysql:
-      charm: cs:trusty/mysql
-    rabbitmq-server:
-      charm: cs:trusty/rabbitmq-server
   overrides:
     series: trusty
     #os-data-network: 10.4.8.0/21
@@ -266,11 +262,6 @@ trusty-kilo-nodes:
 trusty-kilo:
   inherits: contrail
   series: trusty
-  services:
-    mysql:
-      charm: cs:trusty/mysql
-    rabbitmq-server:
-      charm: cs:trusty/rabbitmq-server
   overrides:
     series: trusty
     #os-data-network: 10.4.8.0/21
@@ -291,11 +282,6 @@ trusty-juno-nodes:
 trusty-juno:
   inherits: contrail
   series: trusty
-  services:
-    mysql:
-      charm: cs:trusty/mysql
-    rabbitmq-server:
-      charm: cs:trusty/rabbitmq-server
   overrides:
     series: trusty
     #os-data-network: 10.4.8.0/21
-- 
cgit 1.2.3-korg