modified to match the ocl bundle sync with other bundles.

Change-Id: Ib5a13d7c644e2aae7cde96bdabc6f63fcd111d33
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>

6 files changed, 248 insertions, 286 deletions

diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh
index bf9784f4..61602ba8 100755
--- a/ci/01-deploybundle.sh
+++ b/ci/01-deploybundle.sh
@@ -117,6 +117,7 @@ case "$6" in
     'xenial' )
         #changing the target to the ubuntu distro we want to deploy.
         sed -i -- "s|trusty|$6|g" ./bundles.yaml
+        sed -i -- "s|source-branch:|#source-branch:|g" ./bundles.yaml
         ;;
 esac
 
diff --git a/ci/nosdn/fetch-charms.sh b/ci/nosdn/fetch-charms.sh
index ff0e7180..d170e0e7 100755
--- a/ci/nosdn/fetch-charms.sh
+++ b/ci/nosdn/fetch-charms.sh
@@ -16,7 +16,7 @@ bzr branch lp:~narindergupta/opnfv/ntp $distro/ntp
 bzr branch lp:~openstack-charmers/charms/trusty/hacluster/next $distro/hacluster
 git clone https://github.com/openstack/charm-ceilometer.git $distro/ceilometer
 git clone https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent
-git clone https://github.com/openstack/charm-ceph.git $distro/ceph
+git clone https://github.com/openstack/charm-ceph-mon.git $distro/ceph
 git clone https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd
 git clone https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw
 git clone https://github.com/openstack/charm-cinder.git $distro/cinder
diff --git a/ci/odl/fetch-charms.sh b/ci/odl/fetch-charms.sh
index 8d29e05c..2483fa8c 100755
--- a/ci/odl/fetch-charms.sh
+++ b/ci/odl/fetch-charms.sh
@@ -16,7 +16,7 @@ bzr branch lp:~narindergupta/opnfv/ntp $distro/ntp
 bzr branch lp:~openstack-charmers/charms/trusty/hacluster/next $distro/hacluster
 git clone https://github.com/openstack/charm-ceilometer.git $distro/ceilometer
 git clone https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent
-git clone https://github.com/openstack/charm-ceph.git $distro/ceph
+git clone https://github.com/openstack/charm-ceph-mon.git $distro/ceph
 git clone https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd
 git clone https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw
 git clone https://github.com/openstack/charm-cinder.git $distro/cinder
diff --git a/ci/onos/fetch-charms.sh b/ci/onos/fetch-charms.sh
index 262e44db..43da3785 100755
--- a/ci/onos/fetch-charms.sh
+++ b/ci/onos/fetch-charms.sh
@@ -16,7 +16,7 @@ bzr branch lp:~narindergupta/opnfv/ntp $distro/ntp
 bzr branch lp:~openstack-charmers/charms/trusty/hacluster/next $distro/hacluster
 git clone https://github.com/openstack/charm-ceilometer.git $distro/ceilometer
 git clone https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent
-git clone https://github.com/openstack/charm-ceph.git $distro/ceph
+git clone https://github.com/openstack/charm-ceph-mon.git $distro/ceph
 git clone https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd
 git clone https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw
 git clone https://github.com/openstack/charm-cinder.git $distro/cinder
diff --git a/ci/opencontrail/fetch-charms.sh b/ci/opencontrail/fetch-charms.sh
index c46fee21..3dd8fa0f 100755
--- a/ci/opencontrail/fetch-charms.sh
+++ b/ci/opencontrail/fetch-charms.sh
@@ -18,7 +18,7 @@ bzr branch lp:~openstack-charmers/charms/trusty/hacluster/next $distro/hacluster
 bzr branch lp:~opnfv-team/charms/trusty/haproxy/trunk $distro/haproxy
 git clone https://github.com/openstack/charm-ceilometer.git $distro/ceilometer
 git clone https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent
-git clone https://github.com/openstack/charm-ceph.git $distro/ceph
+git clone https://github.com/openstack/charm-ceph-mon.git $distro/ceph
 git clone https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd
 git clone https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw
 git clone https://github.com/openstack/charm-cinder.git $distro/cinder
diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
index 7ea0576b..b1b69a68 100644
--- a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
@@ -1,47 +1,201 @@
 # vim: set ts=2 et:
+trusty-mitaka-nodes:
+  inherits: openstack-phase1
+  overrides:
+    series: trusty
+
+trusty-mitaka:
+  inherits: openstack-phase2
+  overrides:
+    #os-data-network: 10.4.8.0/21
+    #ceph-cluster-network: 10.4.0.0/21
+    #prefer-ipv6: true
+    #enable-dvr: true
+    #l2-population: true
+    region: Canonical
+    #source: "cloud:trusty-mitaka"
+    openstack-origin: "cloud:trusty-mitaka"
+    series: trusty
+    #ceph-osd-replication-count: 2
+    admin-role: admin
+    keystone-admin-role: admin
+
 openstack-phase1:
   series: trusty
   services:
-    nodes-api:
+    nodes:
+    nodes:
       charm: "cs:trusty/ubuntu"
-      num_units: 3
-      constraints: tags=control
-    nodes-compute:
-      charm: "cs:trusty/ubuntu"
-      num_units: 2
-      constraints: tags=compute
+      num_units: 5
     ntp:
-      charm: "cs:trusty/ntp"
+      charm: "local:trusty/ntp"
       options:
         source: "0.ubuntu.pool.ntp.org 1.ubuntu.pool.ntp.org 2.ubuntu.pool.ntp.org 3.ubuntu.pool.ntp.org"
         auto_peers: false
     zookeeper:
-      branch: lp:~charmers/charms/precise/zookeeper/trunk
+      charm: local:precise/zookeeper
       num_units: 3
       series: precise
       to:
-        - "lxc:nodes-api=2"
-        - "lxc:nodes-api=0"
-        - "lxc:nodes-api=1"
+        - "lxc:nodes=0"
+        - "lxc:nodes=1"
+        - "lxc:nodes=2"
     cassandra:
-      branch: lp:~stub/charms/trusty/cassandra/noauthentication
+      charm: local:trusty/cassandra
       num_units: 3
       to:
-        - "lxc:nodes-api=1"
-        - "lxc:nodes-api=0"
-        - "lxc:nodes-api=2"
+        - "lxc:nodes=1"
+        - "lxc:nodes=2"
+        - "lxc:nodes=3"
       options:
         authenticator: AllowAllAuthenticator
   relations:
     - - "ntp:juju-info"
-      - "nodes-api:juju-info"
+      - "nodes:juju-info"
     - - "ntp:juju-info"
-      - "nodes-compute:juju-info"
+      - "nodes:juju-info"
+
+contrail:
+  inherits: openstack-phase2
+  overrides:
+    admin-role: admin
+  relations:
+    - [ "contrail-configuration:cassandra", "cassandra:database" ]
+    - [ contrail-configuration, zookeeper ]
+    - [ contrail-configuration, rabbitmq-server ]
+    - [ contrail-configuration, keystone ]
+    - [ neutron-api-contrail, contrail-configuration ]
+    - [ neutron-api-contrail, keystone ]
+    - [ "contrail-control:contrail-api", "contrail-configuration:contrail-api" ]
+    - [ "contrail-control:contrail-discovery", "contrail-configuration:contrail-discovery" ]
+    - [ "contrail-control:contrail-ifmap", "contrail-configuration:contrail-ifmap" ]
+    - [ contrail-control, keystone ]
+    - [ "contrail-analytics:cassandra", "cassandra:database" ]
+    - [ "contrail-analytics:contrail-analytics-api", "contrail-configuration:contrail-analytics-api" ]
+    - [ "contrail-configuration:contrail-discovery", "contrail-analytics:contrail-discovery" ]
+    - [ contrail-webui, keystone ]
+    - [ "contrail-webui:contrail_api", "contrail-configuration:contrail-api" ]
+    - [ "contrail-webui:contrail_discovery", "contrail-configuration:contrail-discovery" ]
+    - [ "contrail-webui:cassandra", "cassandra:database" ]
+    - [ nova-compute, neutron-contrail ]
+    - [ "neutron-contrail:contrail-discovery", "contrail-configuration:contrail-discovery" ]
+    - [ "neutron-contrail:contrail-api", "contrail-configuration:contrail-api" ]
+    - [ neutron-contrail, keystone ]
+    - [ contrail-configuration, ntp ]
+    - [ contrail-control, ntp ]
+    - [ contrail-analytics, ntp ]
+    - [ contrail-configuration, haproxy ]
+    - [ contrail-analytics, haproxy ]
+    - [ contrail-webui, haproxy ]
+    - [ haproxy, keepalived ]
+  services:
+    contrail-configuration:
+      charm: local:trusty/contrail-configuration
+      num_units: 3
+      options:
+        vip: 10.4.1.18
+      to:
+        - "lxc:nodes=2"
+        - "lxc:nodes=3"
+        - "lxc:nodes=4"
+    contrail-control:
+      charm: local:trusty/contrail-control
+      num_units: 3
+      to:
+        - "lxc:nodes=3"
+        - "lxc:nodes=4"
+        - "lxc:nodes=0"
+    contrail-analytics:
+      charm: local:trusty/contrail-analytics
+      num_units: 3
+      to:
+        - "lxc:nodes=4"
+        - "lxc:nodes=0"
+        - "lxc:nodes=1"
+    contrail-webui:
+      charm: local:trusty/contrail-webui
+      num_units: 3
+      to:
+        - "lxc:nodes=0"
+        - "lxc:nodes=1"
+        - "lxc:nodes=2"
+    neutron-api-contrail:
+      charm: local:trusty/neutron-api-contrail
+    neutron-contrail:
+      charm: local:trusty/neutron-contrail
+    haproxy:
+      charm: local:trusty/haproxy
+      num_units: 3
+      options:
+        peering_mode: active-active
+      to:
+        - "lxc:nodes=1"
+        - "lxc:nodes=2"
+        - "lxc:nodes=3"
+    keepalived:
+      charm: local:trusty/keepalived
+      options:
+        virtual-ip: 10.4.1.19
+
 openstack-phase2:
   inherits: openstack-phase1
+  relations:
+    - [ "glance:ha", "hacluster-glance:ha" ]
+    - [ "keystone:ha", "hacluster-keystone:ha" ]
+    - [ "neutron-api:ha", "hacluster-neutron:ha" ]
+    - [ "nova-cloud-controller:ha", "hacluster-nova:ha" ]
+    - [ "openstack-dashboard:ha", "hacluster-horizon:ha" ]
+    - [ "ceilometer:ha", "hacluster-ceilometer:ha" ]
+    - [ keystone, mysql ]
+    - [ nova-cloud-controller, mysql ]
+    - [ nova-cloud-controller, rabbitmq-server ]
+    - [ nova-cloud-controller, glance ]
+    - [ nova-cloud-controller, keystone ]
+    - [ nova-compute, nova-cloud-controller ]
+    - [ "nova-compute:shared-db", "mysql:shared-db" ]
+    - [ "nova-compute:amqp", "rabbitmq-server:amqp" ]
+    - [ nova-compute, glance ]
+    - [ glance, mysql ]
+    - [ glance, keystone ]
+    - [ openstack-dashboard, keystone ]
+    - [ neutron-api, mysql ]
+    - [ neutron-api, rabbitmq-server ]
+    - [ neutron-api, nova-cloud-controller ]
+    - [ neutron-api, keystone ]
+    - [ neutron-api, neutron-api-contrail ]
+    - [ "ceilometer:amqp", "rabbitmq-server:amqp" ]
+    - [ "ceilometer-agent:ceilometer-service", "ceilometer:ceilometer-service" ]
+    - [ "ceilometer:identity-service", "keystone:identity-service" ]
+    - [ "ceilometer:identity-notifications", "keystone:identity-notifications" ]
+    - [ "ceilometer-agent:nova-ceilometer", "nova-compute:nova-ceilometer" ]
+    - [ "ceilometer:shared-db", "mongodb:database" ]
+    - [ "heat:shared-db", "mysql:shared-db" ]
+    - [ "heat:identity-service", "keystone:identity-service" ]
+    - [ "heat:amqp", "rabbitmq-server:amqp" ]
+    - [ "cinder:image-service", "glance:image-service" ]
+    - [ "cinder:amqp", "rabbitmq-server:amqp" ]
+    - [ "cinder:identity-service", "keystone:identity-service" ]
+    - [ "cinder:cinder-volume-service", "nova-cloud-controller:cinder-volume-service" ]
+    - [ "cinder-ceph:storage-backend", "cinder:storage-backend" ]
+    - [ "ceph:client", "nova-compute:ceph" ]
+    - [ "cinder:shared-db", "mysql:shared-db" ]
+    - [ "ceph:client", "cinder-ceph:ceph" ]
+    - [ "ceph:client", "glance:ceph" ]
+    - [ "ceph-osd:mon", "ceph:osd" ]
+    - [ "ceph-radosgw:mon", "ceph:radosgw" ]
+    - [ "ceph-radosgw:identity-service", "keystone:identity-service" ]
+    #- - nova-compute:lxd
+      #- lxd:lxd
+    - - congress:shared-db
+      - mysql:shared-db
+    - - congress:identity-service
+      - keystone:identity-service
+    - - congress:amqp
+      - rabbitmq-server:amqp
+
   services:
     mysql:
-      branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next"
+      charm: "local:trusty/percona-cluster"
       num_units: 3
       options:
         dataset-size: 2G
@@ -51,61 +205,61 @@ openstack-phase2:
         sst-password: 127rc14t51
         vip: 10.4.1.15
       to:
-        - "lxc:nodes-api=2"
-        - "lxc:nodes-api=0"
-        - "lxc:nodes-api=1"
+        - "lxc:nodes=2"
+        - "lxc:nodes=3"
+        - "lxc:nodes=4"
     hacluster-keystone:
-      branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
+      charm: "local:trusty/hacluster"
       options:
         corosync_key: |
           'QisjNpoKHLkvyc3PEdDHP5VZjgD0kOk9t0ABPWmCELlu5AgWgnW6bJd34BVXO7VhW+3ZwNQM3W+bZ3pl28ftY4ki4N/S0KLFNia5egFgiA3AH2QXLnokS7OYXuu6GMJJ1S5mDe6P5zU+tfJe/Mebq24u7CgR0gAvohSPRdDTwdY='
     hacluster-horizon:
-      branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
+      charm: "local:trusty/hacluster"
       options:
         corosync_key: |
           'aCVPHw6XYne+Hxv0WPiM3+yEfeIxs0Ly0EMKB494Rdzjf5rE52GcXqqxuvIa/nXJ4GCR+UdKk9FEwcASfYkeu3HDWUld9uTE6pOc+ibWYnybNH7VBfEHW8h9YmQKs3HD2T3wlTcS2irU4CUW7/IKNok4etYdM3iFn1K2ReSGXEI='
     hacluster-nova:
-      branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
+      charm: "local:trusty/hacluster"
       options:
         corosync_key: |
           'gel86qmEze8dYKYbfqIgRpqapJpKtdYL2hxC1y5nWYBPq7EMf6V8mF01IjeUkSRs14CUDrsPpT4PWeom7EOY2fleuLx/aIuqQUfEDkhf/gvaz7BaU4hrmTCoDBK7/HvEwY+/wu4qkEeckzSRPsm9MYzqnLRshh8yjZJ70xU/mmk='
     hacluster-neutron: 
-      branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
+      charm: "local:trusty/hacluster"
       options:
         corosync_key: |
           'KNhb4++3jlllbnscS5D3qdzOJDsQPEeZ7zOLZJHbkKrRjX9gRCijVVOiv2JCvq03HqQ7LIufQzWGl9Za8qh0f6QmQ3XhFh/Cb/3WaYFj+tEf0zArWv+8miswmM1z4eyTSrTWBq0dTgx1z96wjBxP5HV0+1LWW+3Ei4oZWyRGeR0='
     hacluster-glance:
-      branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
+      charm: "local:trusty/hacluster"
       options:
         corosync_key: |
           'el1dd8107J5mwQDPS7tEJPZrr0XFfL95+Tku/QG90W5Q5f5SP4W8TRfKvddGmZWZl2lVd1neG5WqaHa1mq/aScJpoflzVAJCvshN7Gd2AjHhLNNugeI8S90j/7wrKUhqiCAlkKaeri2xs5bB5PZ7Z9AHuNZL7SW1al8lxrKhUFI='
     hacluster-ceilometer:
-      branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
+      charm: "local:trusty/hacluster"
       options:
         corosync_key: |
           'cHkgKGJpdHMgPSA5NjApLgpQcmVzcyBrZXlzIG9uIHlvdXIga2V5Ym9hcmQgdG8gZ2VuZXJhdGUgZW50cm9weSAoYml0cyA9IDEwMDgpLgpXcml0aW5nIGNvcm9zeW5jIGtleSB0byAvZXRjL2Nvcm9zeW5jL2F1dGhrZXkuCg=='
     ceilometer:
-      branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next"
+      charm: "local:trusty/ceilometer"
       num_units: 3
       options:
         vip: 10.4.1.14
       to:
-        - "lxc:nodes-api=2"
-        - "lxc:nodes-api=0"
-        - "lxc:nodes-api=1"
+        - "lxc:nodes=3"
+        - "lxc:nodes=4"
+        - "lxc:nodes=0"
     ceilometer-agent:
-      branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next"
+      charm: "local:trusty/ceilometer-agent"
     mongodb:
       charm: "cs:trusty/mongodb"
       num_units: 1
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=0"
     heat:
-      branch: "lp:~openstack-charmers/charms/trusty/heat/next"
+      charm: "local:trusty/heat"
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=0"
     ceph:
-      branch: lp:~openstack-charmers/charms/trusty/ceph/next
+      charm: local:trusty/ceph
       num_units: 3
       options:
         fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
@@ -116,83 +270,84 @@ openstack-phase2:
 #        ceph-cluster-network: 192.168.0.0/24
 #        ceph-public-network: 192.168.0.0/24
       to:
-        - "lxc:nodes-api=2"
-        - "lxc:nodes-api=0"
-        - "lxc:nodes-api=1"
+        - "lxc:nodes=4"
+        - "lxc:nodes=0"
+        - "lxc:nodes=1"
     ceph-osd:
-      branch: lp:~openstack-charmers/charms/trusty/ceph-osd/next
-      num_units: 2
+      charm: local:trusty/ceph-osd
+      num_units: 3
       options:
         osd-devices: /srv
         osd-reformat: 'yes'
       to:
-        - "nodes-compute=0"
-        - "nodes-compute=1"
+        - "nodes=2"
+        - "nodes=3"
+        - "nodes=4"
     ceph-radosgw:
-      branch: lp:~openstack-charmers/charms/trusty/ceph-radosgw/next
-      num_units: 1
+      charm: local:trusty/ceph-radosgw
       options:
         use-embedded-webserver: true
         operator-roles: "Member,admin"
       to:
-        - "lxc:nodes-api=0"
-
+        - "lxc:nodes=0"
     cinder:
-      branch: lp:~openstack-charmers/charms/trusty/cinder/next
+      charm: local:trusty/cinder
       num_units: 3
       options:
         block-device: None
         glance-api-version: 2
 #        ha-mcastport: 5401
       to:
-        - "lxc:nodes-api=0"
-        - "lxc:nodes-api=1"
-        - "lxc:nodes-api=2"
+        - "lxc:nodes=0"
+        - "lxc:nodes=1"
+        - "lxc:nodes=2"
     cinder-ceph:
-      branch: lp:~openstack-charmers/charms/trusty/cinder-ceph/next
+      charm: local:trusty/cinder-ceph
     rabbitmq-server: 
-      branch: lp:~openstack-charmers/charms/trusty/rabbitmq-server/next
+      charm: local:trusty/rabbitmq-server
       num_units: 3
       to:
-        - "lxc:nodes-api=1"
-        - "lxc:nodes-api=0"
-        - "lxc:nodes-api=2"
+        - "lxc:nodes=1"
+        - "lxc:nodes=2"
+        - "lxc:nodes=3"
     keystone: 
-      branch: lp:~openstack-charmers/charms/trusty/keystone/next
+      charm: local:trusty/keystone
       num_units: 3
       options: 
         admin-password: openstack
         admin-token: admin
         vip: 10.4.1.13
       to:
-        - "lxc:nodes-api=2"
-        - "lxc:nodes-api=0"
-        - "lxc:nodes-api=1"
+        - "lxc:nodes=2"
+        - "lxc:nodes=3"
+        - "lxc:nodes=4"
     openstack-dashboard: 
-      branch: lp:~openstack-charmers/charms/trusty/openstack-dashboard/next
+      charm: local:trusty/openstack-dashboard
       num_units: 3
       options: 
         secret: admin
         vip: 10.4.1.11
         webroot: /
       to:
-        - "lxc:nodes-api=0"
-        - "lxc:nodes-api=1"
-        - "lxc:nodes-api=2"
+        - "lxc:nodes=3"
+        - "lxc:nodes=4"
+        - "lxc:nodes=0"
     nova-compute:
-      branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
-      num_units: 2
+      charm: local:trusty/nova-compute
+      num_units: 4
       options:
         enable-live-migration: False
         manage-neutron-plugin-legacy-mode: False
+        migration-auth-type: ssh
+        #hugepages: "50%"
+        #virt-type: lxd
       to:
-        - "nodes-compute=0"
-        - "nodes-compute=1"
-#        - "nodes-api=0"
-#        - "nodes-api=1"
-#        - "nodes-api=2"
+        - "nodes=1"
+        - "nodes=2"
+        - "nodes=3"
+        - "nodes=4"
     nova-cloud-controller:
-      branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next
+      charm: local:trusty/nova-cloud-controller
       num_units: 3
       options:
         console-access-protocol: novnc
@@ -200,231 +355,37 @@ openstack-phase2:
         service-guard: true
         vip: 10.4.1.16
       to:
-        - "lxc:nodes-api=1"
-        - "lxc:nodes-api=0"
-        - "lxc:nodes-api=2"
+        - "lxc:nodes=4"
+        - "lxc:nodes=0"
+        - "lxc:nodes=1"
     neutron-api:
-      branch: lp:~opnfv-team/charms/trusty/neutron-api/next
+      charm: local:trusty/neutron-api
       num_units: 3
       options:
         neutron-security-groups: True
         manage-neutron-plugin-legacy-mode: False
         vip: 10.4.1.17
       to:
-        - "lxc:nodes-api=2"
-        - "lxc:nodes-api=0"
-        - "lxc:nodes-api=1"
+        - "lxc:nodes=0"
+        - "lxc:nodes=1"
+        - "lxc:nodes=2"
     glance:
-      branch: lp:~openstack-charmers/charms/trusty/glance/next
+      charm: local:trusty/glance
       num_units: 3
       options:
         vip: 10.4.1.12
       to:
-        - "lxc:nodes-api=1"
-        - "lxc:nodes-api=0"
-        - "lxc:nodes-api=2"
+        - "lxc:nodes=1"
+        - "lxc:nodes=2"
+        - "lxc:nodes=3"
     opnfv-promise:
-      branch: lp:~narindergupta/charms/trusty/promise/trunk
+      charm: local:trusty/promise
       num_units: 1
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=0"
     congress:
       charm: local:trusty/congress
       options:
-        source-branch: stable/mitaka
+        source-charm: stable/mitaka
       to:
-        - "lxc:nodes-api=0"
-  relations:
-    - [ "glance:ha", "hacluster-glance:ha" ]
-    - [ "keystone:ha", "hacluster-keystone:ha" ]
-    - [ "neutron-api:ha", "hacluster-neutron:ha" ]
-    - [ "nova-cloud-controller:ha", "hacluster-nova:ha" ]
-    - [ "openstack-dashboard:ha", "hacluster-horizon:ha" ]
-    - [ "ceilometer:ha", "hacluster-ceilometer:ha" ] 
-    - [ keystone, mysql ]
-    - [ nova-cloud-controller, mysql ]
-    - [ nova-cloud-controller, rabbitmq-server ]
-    - [ nova-cloud-controller, glance ]
-    - [ nova-cloud-controller, keystone ]
-    - [ nova-compute, nova-cloud-controller ]
-    - [ "nova-compute:shared-db", "mysql:shared-db" ]
-    - [ "nova-compute:amqp", "rabbitmq-server:amqp" ]
-    - [ nova-compute, glance ]
-    - [ glance, mysql ]
-    - [ glance, keystone ]
-    - [ openstack-dashboard, keystone ]
-    - [ neutron-api, mysql ]
-    - [ neutron-api, rabbitmq-server ]
-    - [ neutron-api, nova-cloud-controller ]
-    - [ neutron-api, keystone ]
-    - [ neutron-api, neutron-api-contrail ]
-    - [ "ceilometer:amqp", "rabbitmq-server:amqp" ]
-    - [ "ceilometer-agent:ceilometer-service", "ceilometer:ceilometer-service" ]
-    - [ "ceilometer:identity-service", "keystone:identity-service" ]
-    - [ "ceilometer:identity-notifications", "keystone:identity-notifications" ]
-    - [ "ceilometer-agent:nova-ceilometer", "nova-compute:nova-ceilometer" ]
-    - [ "ceilometer:shared-db", "mongodb:database" ]
-    - [ "heat:shared-db", "mysql:shared-db" ]
-    - [ "heat:identity-service", "keystone:identity-service" ]
-    - [ "heat:amqp", "rabbitmq-server:amqp" ]
-    - [ "cinder:image-service", "glance:image-service" ]
-    - [ "cinder:amqp", "rabbitmq-server:amqp" ]
-    - [ "cinder:identity-service", "keystone:identity-service" ]
-    - [ "cinder:cinder-volume-service", "nova-cloud-controller:cinder-volume-service" ]
-    - [ "cinder-ceph:storage-backend", "cinder:storage-backend" ]
-    - [ "ceph:client", "nova-compute:ceph" ]
-    - [ "cinder:shared-db", "mysql:shared-db" ]
-    - [ "ceph:client", "cinder-ceph:ceph" ]
-    - [ "ceph:client", "glance:ceph" ]
-    - [ "ceph-osd:mon", "ceph:osd" ]
-    - [ "ceph-radosgw:mon", "ceph:radosgw" ]
-    - [ "ceph-radosgw:identity-service", "keystone:identity-service" ]
-    - - congress:shared-db
-      - mysql:shared-db
-    - - congress:identity-service
-      - keystone:identity-service
-    - - congress:amqp
-      - rabbitmq-server:amqp
-contrail:
-  inherits: openstack-phase2
-  services:
-    contrail-configuration:
-      branch: lp:~sdn-charmers/charms/trusty/contrail-configuration/trunk
-      num_units: 3
-      options:
-        vip: 10.4.1.18
-      to:
-        - "lxc:nodes-api=0"
-        - "lxc:nodes-api=1"
-        - "lxc:nodes-api=2"
-    contrail-control:
-      branch: lp:~sdn-charmers/charms/trusty/contrail-control/trunk
-      num_units: 3
-      to:
-        - "lxc:nodes-api=0"
-        - "lxc:nodes-api=1"
-        - "lxc:nodes-api=2"
-    contrail-analytics:
-      branch: lp:~sdn-charmers/charms/trusty/contrail-analytics/trunk
-      num_units: 3
-      to:
-        - "lxc:nodes-api=0"
-        - "lxc:nodes-api=1"
-        - "lxc:nodes-api=2"
-    contrail-webui:
-      branch: lp:~sdn-charmers/charms/trusty/contrail-webui/trunk
-      num_units: 3
-      to:
-        - "lxc:nodes-api=0"
-        - "lxc:nodes-api=1"
-        - "lxc:nodes-api=2"
-    neutron-api-contrail:
-      branch: lp:~opnfv-team/charms/trusty/neutron-api-contrail/trunk
-    neutron-contrail:
-      branch: lp:~opnfv-team/charms/trusty/neutron-contrail/trunk
-    haproxy:
-      branch: lp:~opnfv-team/charms/trusty/haproxy/trunk
-      num_units: 3
-      options:
-        peering_mode: active-active
-      to:
-        - "lxc:nodes-api=0"
-        - "lxc:nodes-api=1"
-        - "lxc:nodes-api=2"
-    keepalived:
-      branch: lp:~sdn-charmers/charms/trusty/keepalived/trunk
-      options:
-        virtual-ip: 10.4.1.19
-  overrides:
-    admin-role: admin
-  relations:
-    - [ "contrail-configuration:cassandra", "cassandra:database" ]
-    - [ contrail-configuration, zookeeper ]
-    - [ contrail-configuration, rabbitmq-server ]
-    - [ contrail-configuration, keystone ]
-    - [ neutron-api-contrail, contrail-configuration ]
-    - [ neutron-api-contrail, keystone ]
-    - [ "contrail-control:contrail-api", "contrail-configuration:contrail-api" ]
-    - [ "contrail-control:contrail-discovery", "contrail-configuration:contrail-discovery" ]
-    - [ "contrail-control:contrail-ifmap", "contrail-configuration:contrail-ifmap" ]
-    - [ contrail-control, keystone ]
-    - [ "contrail-analytics:cassandra", "cassandra:database" ]
-    - [ "contrail-analytics:contrail-analytics-api", "contrail-configuration:contrail-analytics-api" ]
-    - [ "contrail-configuration:contrail-discovery", "contrail-analytics:contrail-discovery" ]
-    - [ contrail-webui, keystone ]
-    - [ "contrail-webui:contrail_api", "contrail-configuration:contrail-api" ]
-    - [ "contrail-webui:contrail_discovery", "contrail-configuration:contrail-discovery" ]
-    - [ "contrail-webui:cassandra", "cassandra:database" ]
-    - [ nova-compute, neutron-contrail ]
-    - [ "neutron-contrail:contrail-discovery", "contrail-configuration:contrail-discovery" ]
-    - [ "neutron-contrail:contrail-api", "contrail-configuration:contrail-api" ]
-    - [ neutron-contrail, keystone ]
-    - [ contrail-configuration, ntp ]
-    - [ contrail-control, ntp ]
-    - [ contrail-analytics, ntp ]
-    - [ contrail-configuration, haproxy ]
-    - [ contrail-analytics, haproxy ]
-    - [ contrail-webui, haproxy ]
-    - [ haproxy, keepalived ]
-trusty-liberty-nodes:
-  inherits: openstack-phase1
-  series: trusty
-  overrides:
-    series: trusty
-    
-trusty-liberty: 
-  inherits: contrail
-  series: trusty
-  overrides:
-    series: trusty
-    #os-data-network: 10.4.8.0/21
-    #ceph-cluster-network: 10.4.0.0/21
-    #prefer-ipv6: true
-    region: Canonical
-    openstack-origin: cloud:trusty-liberty
-    source: "cloud:trusty-liberty"
-    ceph-osd-replication-count: 2
-    admin-role: admin
-    keystone-admin-role: admin
-
-trusty-kilo-nodes:
-  inherits: openstack-phase1
-  series: trusty
-  overrides:
-    series: trusty
-
-trusty-kilo:
-  inherits: contrail
-  series: trusty
-  overrides:
-    series: trusty
-    #os-data-network: 10.4.8.0/21
-    #ceph-cluster-network: 10.4.0.0/21
-    #prefer-ipv6: true
-    region: Canonical
-    openstack-origin: cloud:trusty-kilo
-    source: "cloud:trusty-kilo"
-    ceph-osd-replication-count: 2
-    admin-role: admin
-    keystone-admin-role: admin
-
-trusty-juno-nodes:
-  inherits: openstack-phase1
-  overrides:
-    series: trusty
-
-trusty-juno:
-  inherits: contrail
-  series: trusty
-  overrides:
-    series: trusty
-    #os-data-network: 10.4.8.0/21
-    #ceph-cluster-network: 10.4.0.0/21
-    #prefer-ipv6: true
-    region: Canonical
-    openstack-origin: cloud:trusty-juno
-    source: "cloud:trusty-juno"
-    ceph-osd-replication-count: 2
-    admin-role: admin
-    keystone-admin-role: admin
-
+        - "lxc:nodes=0"