mofidied the bundles to use the latest charms from next branch.

Change-Id: I887bf5d62899fb4efcfc7ec19376f8722f6e1528

8 files changed, 53 insertions, 83 deletions

diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
index 75f3cafd..966c0573 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
@@ -58,7 +58,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
@@ -66,7 +66,7 @@ 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
diff --git a/ci/odl/juju-deployer/ovs-odl-nonha.yaml b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
index d4c398de..9a47982c 100644
--- a/ci/odl/juju-deployer/ovs-odl-nonha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
@@ -58,7 +58,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
@@ -66,7 +66,7 @@ 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
@@ -163,7 +163,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     neutron-api-odl:
-      branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/vpp
+      branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/next
       options:
         overlay-network-type: 'vxlan gre'
         security-groups: True
diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml
index 2d83b60d..68b5f5ed 100644
--- a/ci/odl/juju-deployer/ovs-odl-tip.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml
@@ -58,7 +58,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
@@ -66,7 +66,7 @@ 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
@@ -166,7 +166,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     neutron-api-odl:
-      branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/vpp
+      branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/next
       options:
         overlay-network-type: 'vxlan gre'
         security-groups: True
diff --git a/ci/onos/juju-deployer/ovs-onos-nonha.yaml b/ci/onos/juju-deployer/ovs-onos-nonha.yaml
index e2a7e3b0..c264965e 100644
--- a/ci/onos/juju-deployer/ovs-onos-nonha.yaml
+++ b/ci/onos/juju-deployer/ovs-onos-nonha.yaml
@@ -58,7 +58,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
@@ -66,7 +66,7 @@ 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
diff --git a/ci/onos/juju-deployer/ovs-onos-tip.yaml b/ci/onos/juju-deployer/ovs-onos-tip.yaml
index 1e173d18..dfd76a17 100644
--- a/ci/onos/juju-deployer/ovs-onos-tip.yaml
+++ b/ci/onos/juju-deployer/ovs-onos-tip.yaml
@@ -58,7 +58,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
@@ -66,7 +66,7 @@ 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
diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
index 9b26389a..846fb020 100644
--- a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
@@ -52,32 +52,32 @@ openstack-phase2:
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
     "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=='
@@ -102,14 +102,14 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     ceph:
-      charm: cs:trusty/ceph
+      branch: lp:~openstack-charmers/charms/trusty/ceph/next
       num_units: 3
       options:
         fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
         monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
         osd-devices: ""
         monitor-count: 3
-        osd-reformat: 'no'
+#        osd-reformat: 'no'
 #        ceph-cluster-network: 192.168.0.0/24
 #        ceph-public-network: 192.168.0.0/24
       to:
@@ -117,7 +117,7 @@ openstack-phase2:
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
     ceph-osd:
-      charm: cs:trusty/ceph-osd
+      branch: lp:~openstack-charmers/charms/trusty/ceph-osd/next
       num_units: 2
       options:
         osd-devices: /srv
@@ -126,7 +126,7 @@ openstack-phase2:
         - "nodes-compute=0"
         - "nodes-compute=1"
     ceph-radosgw:
-      charm: cs:trusty/ceph-radosgw
+      branch: lp:~openstack-charmers/charms/trusty/ceph-radosgw/next
       num_units: 1
       options:
         use-embedded-webserver: true
@@ -135,7 +135,7 @@ openstack-phase2:
         - "lxc:nodes-api=0"
 
     cinder:
-      charm: cs:trusty/cinder
+      branch: lp:~openstack-charmers/charms/trusty/cinder/next
       num_units: 3
       options:
         block-device: None
@@ -146,16 +146,16 @@ openstack-phase2:
         - "lxc:nodes-api=1"
         - "lxc:nodes-api=2"
     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=1"
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=2"
     "keystone": 
-      branch: lp:charms/trusty/keystone
+      branch: lp:~openstack-charmers/charms/trusty/keystone/next
       num_units: 3
       options: 
         "admin-password": openstack
@@ -166,7 +166,7 @@ openstack-phase2:
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
     "openstack-dashboard": 
-      branch: lp:charms/trusty/openstack-dashboard
+      branch: lp:~openstack-charmers/charms/trusty/openstack-dashboard/next
       num_units: 3
       options: 
         secret: admin
@@ -189,13 +189,14 @@ 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
         "network-manager": Neutron
         "quantum-security-groups": "yes"
         "service-guard": true
+        "neutron-external-network": ext_net
         vip: 10.4.1.16
       to:
         - "lxc:nodes-api=1"
@@ -213,7 +214,7 @@ openstack-phase2:
         - "lxc:nodes-api=0"
         - "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/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
diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml
index 25c81b16..e678b391 100644
--- a/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.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,14 @@ 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
       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 +93,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
@@ -109,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:
         openstack-origin-git: include-file://horizon-master.yaml
@@ -127,7 +127,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
@@ -142,7 +142,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
@@ -238,18 +238,12 @@ contrail:
     - [ "ceph-radosgw:identity-service", "keystone:identity-service" ]
 trusty-liberty-nodes:
   inherits: openstack-phase1
-  series: trusty
   overrides:
     series: trusty
 
 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
@@ -264,18 +258,12 @@ trusty-liberty:
 
 trusty-kilo-nodes:
   inherits: openstack-phase1
-  series: trusty
   overrides:
     series: trusty
 
 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
@@ -296,11 +284,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