From 530c6ecfe188a4ec06eb6ddfbba8d8934bd0cc3d Mon Sep 17 00:00:00 2001
From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Tue, 19 Jan 2016 21:57:07 -0600
Subject: modified to use the next charm as hacluster charm issue with
 keystone.

Change-Id: I030ec92bb1fe0c494c5a63ba046864be509f92e2
---
 ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml | 34 ++++++++++++++---------------
 1 file changed, 17 insertions(+), 17 deletions(-)

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

diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
index 85cf997c..e3795792 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
@@ -21,14 +21,14 @@ openstack-phase2:
   inherits: openstack-phase1
   services:
     ceilometer:
-      charm: cs:trusty/ceilometer
+      branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next"
       num_units: 1
       to:
         - "lxc:nodes-api=0"
     ceilometer-agent:
-      charm: cs:trusty/ceilometer-agent
+      branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next"
     ceph:
-      charm: cs:trusty/ceph
+      branch: "lp:~openstack-charmers/charms/trusty/ceph/next"
       num_units: 1
       options:
         monitor-count: 1
@@ -41,7 +41,7 @@ openstack-phase2:
       to:
         - "nodes-compute=0"
     ceph-osd:
-      charm: cs:trusty/ceph-osd
+      branch: "lp:~openstack-charmers/charms/trusty/ceph-osd/next"
       num_units: 1
       options:
         osd-devices: /srv
@@ -49,7 +49,7 @@ openstack-phase2:
       to:
         - "nodes-api=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
@@ -57,7 +57,7 @@ openstack-phase2:
       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
@@ -66,10 +66,10 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     cinder-ceph:
-      charm: cs:trusty/cinder-ceph
+      branch: "lp:~openstack-charmers/charms/trusty/cinder-ceph/next"
       num_units: 0
     glance:
-      charm: cs:trusty/glance
+      branch: "lp:~openstack-charmers/charms/trusty/glance/next"
       num_units: 1
       options:
         ha-mcastport: 5402
@@ -81,7 +81,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     keystone:
-      charm: cs:trusty/keystone
+      branch: "lp:~openstack-charmers/charms/trusty/keystone/next"
       num_units: 1
       options:
         admin-password: openstack
@@ -102,14 +102,14 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     neutron-api:
-      charm: cs:trusty/neutron-api
+      branch: "lp:~openstack-charmers/charms/trusty/neutron-api/next"
       num_units: 1
       options:
         neutron-security-groups: true
       to:
         - "lxc:nodes-api=0"
     neutron-gateway:
-      charm: cs:trusty/neutron-gateway
+      branch: "lp:~openstack-charmers/charms/trusty/neutron-gateway/next"
       num_units: 1
       options:
         instance-mtu: 1400
@@ -117,10 +117,10 @@ openstack-phase2:
       to:
         - "nodes-api=0"
     neutron-openvswitch:
-      charm: cs:trusty/neutron-openvswitch
+      branch: "lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next"
       num_units: 0
     nova-cloud-controller:
-      charm: cs:trusty/nova-cloud-controller
+      branch: "lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next"
       num_units: 1
       options:
         network-manager: Neutron
@@ -128,7 +128,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     nova-compute:
-      charm: cs:trusty/nova-compute
+      branch: "lp:~openstack-charmers/charms/trusty/nova-compute/next"
       num_units: 1
       options:
         enable-live-migration: true
@@ -142,7 +142,7 @@ openstack-phase2:
 #        - "nodes-api=1"
 #        - "nodes-api=2"
     openstack-dashboard:
-      charm: cs:trusty/openstack-dashboard
+      branch: "lp:~openstack-charmers/charms/trusty/openstack-dashboard/next"
       num_units: 1
       options:
         secret: admin
@@ -150,12 +150,12 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     rabbitmq-server:
-      charm: cs:trusty/rabbitmq-server
+      branch: "lp:~openstack-charmers/charms/trusty/rabbitmq-server/next"
       num_units: 1
       to:
         - "lxc:nodes-api=0"
     heat:
-      charm: cs:trusty/heat
+      branch: "lp:~openstack-charmers/charms/trusty/heat/next"
       to:
         - "lxc:nodes-api=0"
   relations:
-- 
cgit 1.2.3-korg