Merge "modified to use the next charm as hacluster charm issue with keystone." into stable/brahmaputra

6 files changed, 86 insertions, 86 deletions

diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
index 4740a676..29a04af2 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
@@ -21,16 +21,16 @@ openstack-phase2:
   inherits: openstack-phase1
   services:
     ceilometer:
-      charm: cs:trusty/ceilometer
+      branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next"
       num_units: 3
       to:
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
         - "lxc:nodes-api=2"
     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: 2
       options:
         monitor-count: 1
@@ -44,7 +44,7 @@ openstack-phase2:
         - "nodes-compute=0"
         - "nodes-compute=1"
     ceph-osd:
-      charm: cs:trusty/ceph-osd
+      branch: "lp:~openstack-charmers/charms/trusty/ceph-osd/next"
       num_units: 3
       options:
         osd-devices: /srv
@@ -54,7 +54,7 @@ openstack-phase2:
         - "nodes-api=1"
         - "nodes-api=2"
     ceph-radosgw:
-      charm: cs:trusty/ceph-radosgw
+      branch: "lp:~openstack-charmers/charms/trusty/ceph-radosgw/next"
       num_units: 1
       options:
         use-embedded-webserver: true
@@ -62,7 +62,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     cinder:
-      charm: cs:trusty/cinder
+      branch: "lp:~openstack-charmers/charms/trusty/cinder/next"
       num_units: 3
       options:
         block-device: None
@@ -73,10 +73,10 @@ openstack-phase2:
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=2"
     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: 3
       options:
         ha-mcastport: 5402
@@ -91,7 +91,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=2"
     keystone:
-      charm: cs:trusty/keystone
+      branch: "lp:~openstack-charmers/charms/trusty/keystone/next"
       num_units: 3
       options:
         admin-password: openstack
@@ -121,7 +121,7 @@ openstack-phase2:
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=2"
     neutron-api:
-      charm: cs:trusty/neutron-api
+      branch: "lp:~openstack-charmers/charms/trusty/neutron-api/next"
       num_units: 3
       options:
         neutron-security-groups: true
@@ -131,7 +131,7 @@ openstack-phase2:
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
     neutron-gateway:
-      charm: cs:trusty/neutron-gateway
+      branch: "lp:~openstack-charmers/charms/trusty/neutron-gateway/next"
       num_units: 1
       options:
 #        "ext-port": "eth1"
@@ -139,10 +139,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: 3
       options:
         network-manager: Neutron
@@ -154,7 +154,7 @@ openstack-phase2:
         - "lxc:nodes-api=1"
         - "lxc:nodes-api=2"
     nova-compute:
-      charm: cs:trusty/nova-compute
+      branch: "lp:~openstack-charmers/charms/trusty/nova-compute/next"
       num_units: 2
       options:
         enable-live-migration: true
@@ -168,7 +168,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: 3
       options:
         secret: admin
@@ -179,38 +179,38 @@ openstack-phase2:
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=2"
     rabbitmq-server:
-      charm: cs:trusty/rabbitmq-server
+      branch: "lp:~openstack-charmers/charms/trusty/rabbitmq-server/next"
       num_units: 3
       to:
         - "lxc:nodes-api=2"
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
     heat:
-      charm: cs:trusty/heat
+      branch: "lp:~openstack-charmers/charms/trusty/heat/next"
       to:
         - "lxc:nodes-api=0"
     hacluster-keystone:
-      charm: cs:trusty/hacluster
+      branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
       options:
         corosync_key: |
           'QisjNpoKHLkvyc3PEdDHP5VZjgD0kOk9t0ABPWmCELlu5AgWgnW6bJd34BVXO7VhW+3ZwNQM3W+bZ3pl28ftY4ki4N/S0KLFNia5egFgiA3AH2QXLnokS7OYXuu6GMJJ1S5mDe6P5zU+tfJe/Mebq24u7CgR0gAvohSPRdDTwdY='
     hacluster-horizon:
-      charm: cs:trusty/hacluster
+      branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
       options:
         corosync_key: |
           'aCVPHw6XYne+Hxv0WPiM3+yEfeIxs0Ly0EMKB494Rdzjf5rE52GcXqqxuvIa/nXJ4GCR+UdKk9FEwcASfYkeu3HDWUld9uTE6pOc+ibWYnybNH7VBfEHW8h9YmQKs3HD2T3wlTcS2irU4CUW7/IKNok4etYdM3iFn1K2ReSGXEI='
     hacluster-nova:
-      charm: cs:trusty/hacluster
+      branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
       options:
         corosync_key: |
           'gel86qmEze8dYKYbfqIgRpqapJpKtdYL2hxC1y5nWYBPq7EMf6V8mF01IjeUkSRs14CUDrsPpT4PWeom7EOY2fleuLx/aIuqQUfEDkhf/gvaz7BaU4hrmTCoDBK7/HvEwY+/wu4qkEeckzSRPsm9MYzqnLRshh8yjZJ70xU/mmk='
     hacluster-neutron:
-      charm: cs:trusty/hacluster
+      branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
       options:
         corosync_key: |
           'KNhb4++3jlllbnscS5D3qdzOJDsQPEeZ7zOLZJHbkKrRjX9gRCijVVOiv2JCvq03HqQ7LIufQzWGl9Za8qh0f6QmQ3XhFh/Cb/3WaYFj+tEf0zArWv+8miswmM1z4eyTSrTWBq0dTgx1z96wjBxP5HV0+1LWW+3Ei4oZWyRGeR0='
     hacluster-glance:
-      charm: cs:trusty/hacluster
+      branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
       options:
         corosync_key: |
           'el1dd8107J5mwQDPS7tEJPZrr0XFfL95+Tku/QG90W5Q5f5SP4W8TRfKvddGmZWZl2lVd1neG5WqaHa1mq/aScJpoflzVAJCvshN7Gd2AjHhLNNugeI8S90j/7wrKUhqiCAlkKaeri2xs5bB5PZ7Z9AHuNZL7SW1al8lxrKhUFI='
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:
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
index 98d7ba7a..c342d43d 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
@@ -21,7 +21,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
@@ -45,7 +45,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
@@ -75,7 +75,7 @@ openstack-phase2:
 
 #        - "lxc:nodes-api=0"
     cinder:
-      charm: cs:trusty/cinder
+      branch: "lp:~openstack-charmers/charms/trusty/cinder/next"
       num_units: 1
       options:
         block-device: None
@@ -85,14 +85,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:
         openstack-origin-git: include-file://keystone-master.yaml
@@ -101,7 +101,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:
         openstack-origin-git: include-file://horizon-master.yaml
@@ -119,7 +119,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:
         openstack-origin-git: include-file://nova-master.yaml
@@ -137,7 +137,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     neutron-gateway:
-      branch: lp:charms/trusty/neutron-gateway
+      branch: "lp:~openstack-charmers/charms/trusty/neutron-gateway/next"
       options:
         openstack-origin-git: include-file://neutron-master.yaml
         instance-mtu: 1400
@@ -145,7 +145,7 @@ openstack-phase2:
       to:
         - "nodes-api=0"
     "glance":
-      branch: lp:charms/trusty/glance
+      branch: "lp:~openstack-charmers/charms/trusty/glance/next"
       num_units: 1
       options:
         openstack-origin-git: include-file://glance-master.yaml
@@ -157,7 +157,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     neutron-openvswitch:
-      branch: lp:~openstack-charmers/charms/trusty/neutron-openvswitch/trunk
+      branch: "lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next"
       options:
         openstack-origin-git: include-file://neutron-master.yaml
   relations:
diff --git a/ci/onos/juju-deployer/ovs-onos-ha.yaml b/ci/onos/juju-deployer/ovs-onos-ha.yaml
index 77e42013..0e9373b7 100644
--- a/ci/onos/juju-deployer/ovs-onos-ha.yaml
+++ b/ci/onos/juju-deployer/ovs-onos-ha.yaml
@@ -35,32 +35,32 @@ openstack-phase2:
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=2"
     "hacluster-keystone":
-      charm: "cs:trusty/hacluster"
+      branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
       options:
         corosync_key: |
           'QisjNpoKHLkvyc3PEdDHP5VZjgD0kOk9t0ABPWmCELlu5AgWgnW6bJd34BVXO7VhW+3ZwNQM3W+bZ3pl28ftY4ki4N/S0KLFNia5egFgiA3AH2QXLnokS7OYXuu6GMJJ1S5mDe6P5zU+tfJe/Mebq24u7CgR0gAvohSPRdDTwdY='
     "hacluster-horizon":
-      charm: "cs:trusty/hacluster"
+      branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
       options:
         corosync_key: |
           'aCVPHw6XYne+Hxv0WPiM3+yEfeIxs0Ly0EMKB494Rdzjf5rE52GcXqqxuvIa/nXJ4GCR+UdKk9FEwcASfYkeu3HDWUld9uTE6pOc+ibWYnybNH7VBfEHW8h9YmQKs3HD2T3wlTcS2irU4CUW7/IKNok4etYdM3iFn1K2ReSGXEI='
     "hacluster-nova":
-      charm: "cs:trusty/hacluster"
+      branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
       options:
         corosync_key: |
           'gel86qmEze8dYKYbfqIgRpqapJpKtdYL2hxC1y5nWYBPq7EMf6V8mF01IjeUkSRs14CUDrsPpT4PWeom7EOY2fleuLx/aIuqQUfEDkhf/gvaz7BaU4hrmTCoDBK7/HvEwY+/wu4qkEeckzSRPsm9MYzqnLRshh8yjZJ70xU/mmk='
     "hacluster-neutron": 
-      charm: "cs:trusty/hacluster"
+      branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
       options:
         corosync_key: |
           'KNhb4++3jlllbnscS5D3qdzOJDsQPEeZ7zOLZJHbkKrRjX9gRCijVVOiv2JCvq03HqQ7LIufQzWGl9Za8qh0f6QmQ3XhFh/Cb/3WaYFj+tEf0zArWv+8miswmM1z4eyTSrTWBq0dTgx1z96wjBxP5HV0+1LWW+3Ei4oZWyRGeR0='
     "hacluster-glance":
-      charm: "cs:trusty/hacluster"
+      branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
       options:
         corosync_key: |
           'el1dd8107J5mwQDPS7tEJPZrr0XFfL95+Tku/QG90W5Q5f5SP4W8TRfKvddGmZWZl2lVd1neG5WqaHa1mq/aScJpoflzVAJCvshN7Gd2AjHhLNNugeI8S90j/7wrKUhqiCAlkKaeri2xs5bB5PZ7Z9AHuNZL7SW1al8lxrKhUFI='
     "hacluster-ceilometer":
-      charm: "cs:trusty/hacluster"
+      branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
       options:
         corosync_key: |
           'cHkgKGJpdHMgPSA5NjApLgpQcmVzcyBrZXlzIG9uIHlvdXIga2V5Ym9hcmQgdG8gZ2VuZXJhdGUgZW50cm9weSAoYml0cyA9IDEwMDgpLgpXcml0aW5nIGNvcm9zeW5jIGtleSB0byAvZXRjL2Nvcm9zeW5jL2F1dGhrZXkuCg=='
@@ -85,7 +85,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     ceph:
-      charm: cs:trusty/ceph
+      branch: "lp:~openstack-charmers/charms/trusty/ceph/next"
       num_units: 2
       options:
         fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
@@ -99,7 +99,7 @@ openstack-phase2:
         - "nodes-compute=0"
         - "nodes-compute=1"
     ceph-osd:
-      charm: cs:trusty/ceph-osd
+      branch: "lp:~openstack-charmers/charms/trusty/ceph-osd/next"
       num_units: 1
       options:
         osd-devices: /srv
@@ -107,7 +107,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: 3
       options:
         use-embedded-webserver: true
@@ -118,7 +118,7 @@ openstack-phase2:
         - "lxc:nodes-api=2"
 
     cinder:
-      charm: cs:trusty/cinder
+      branch: "lp:~openstack-charmers/charms/trusty/cinder/next"
       num_units: 3
       options:
         block-device: None
@@ -129,16 +129,16 @@ openstack-phase2:
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
     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: 3
       to:
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
         - "lxc:nodes-api=2"
     "keystone": 
-      branch: lp:charms/trusty/keystone
+      branch: "lp:~openstack-charmers/charms/trusty/keystone/next"
       num_units: 3
       options: 
 #        ha-mcastport: 5402
@@ -150,7 +150,7 @@ openstack-phase2:
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=2"
     "openstack-dashboard": 
-      branch: lp:charms/trusty/openstack-dashboard
+      branch: "lp:~openstack-charmers/charms/trusty/openstack-dashboard/next"
       num_units: 3
       options: 
         secret: admin
@@ -173,7 +173,7 @@ openstack-phase2:
 #        - "nodes-api=1"
 #        - "nodes-api=2"
     "nova-cloud-controller": 
-      branch: lp:charms/trusty/nova-cloud-controller
+      branch: "lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next"
       num_units: 3
       options: 
         "console-access-protocol": novnc
@@ -209,7 +209,7 @@ openstack-phase2:
       to: 
         - "lxc:nodes-api=1"
     "glance": 
-      branch: lp:charms/trusty/glance
+      branch: lp:~openstack-charmers/charms/trusty/glance/next
       num_units: 3
       options: 
         vip: 10.4.1.12
diff --git a/ci/onos/juju-deployer/ovs-onos-nonha.yaml b/ci/onos/juju-deployer/ovs-onos-nonha.yaml
index 28983bbe..51598f81 100644
--- a/ci/onos/juju-deployer/ovs-onos-nonha.yaml
+++ b/ci/onos/juju-deployer/ovs-onos-nonha.yaml
@@ -21,7 +21,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
@@ -45,7 +45,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
@@ -74,7 +74,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
@@ -83,14 +83,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: 
 #        ha-mcastport: 5402
@@ -99,7 +99,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
@@ -119,7 +119,7 @@ openstack-phase2:
 #        - "nodes-api=1"
 #        - "nodes-api=2"
     "nova-cloud-controller": 
-      branch: lp:charms/trusty/nova-cloud-controller
+      branch: "lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next"
       num_units: 1
       options: 
         "console-access-protocol": novnc
@@ -136,7 +136,7 @@ openstack-phase2:
       to: 
         - "lxc:nodes-api=0"
     neutron-gateway:
-      branch: "lp:~wuwenbin2/onosfw/neutron-gateway"
+      branch: lp:~openstack-charmers/charms/trusty/neutron-gateway/next
       options:
 #        "ext-port": "eth1"
         plugin: onos
@@ -148,7 +148,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"
diff --git a/ci/onos/juju-deployer/ovs-onos-tip.yaml b/ci/onos/juju-deployer/ovs-onos-tip.yaml
index 11ff4717..a71c7401 100644
--- a/ci/onos/juju-deployer/ovs-onos-tip.yaml
+++ b/ci/onos/juju-deployer/ovs-onos-tip.yaml
@@ -21,7 +21,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
@@ -45,7 +45,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     ceph:
-      charm: cs:trusty/ceph
+      branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next"
       num_units: 1
       options:
         fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
@@ -75,7 +75,7 @@ openstack-phase2:
 
 #        - "lxc:nodes-api=0"
     cinder:
-      charm: cs:trusty/cinder
+      branch: "lp:~openstack-charmers/charms/trusty/cinder/next"
       num_units: 1
       options:
         block-device: None
@@ -85,14 +85,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:
         openstack-origin-git: include-file://keystone-master.yaml
@@ -101,7 +101,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:
         openstack-origin-git: include-file://horizon-master.yaml
@@ -119,7 +119,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:
         openstack-origin-git: include-file://nova-master.yaml
@@ -137,7 +137,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     neutron-gateway:
-      branch: "lp:~wuwenbin2/onosfw/neutron-gateway"
+      branch: "lp:~openstack-charmers/charms/trusty/neutron-gateway/next"
       options:
         openstack-origin-git: include-file://neutron-master.yaml
 #        "ext-port": "eth1"
@@ -150,7 +150,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
       options:
         openstack-origin-git: include-file://glance-master.yaml