change the location of the target to accomodate the future develop

ment.

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

3 files changed, 374 insertions, 370 deletions

diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
index fb6b8a97..e9094fa3 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
@@ -1,4 +1,26 @@
 # 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
+    #ext-port: "eth1"
+    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:
@@ -10,9 +32,137 @@ openstack-phase1:
   relations:
     - - "ntp:juju-info"
       - "nodes:juju-info"
+
 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
+    - - nova-compute:amqp
+      - rabbitmq-server:amqp
+    - - neutron-gateway:amqp
+      - rabbitmq-server:amqp
+    - - keystone:shared-db
+      - mysql:shared-db
+    - - nova-cloud-controller:identity-service
+      - keystone:identity-service
+    - - glance:identity-service
+      - keystone:identity-service
+    - - neutron-api:identity-service
+      - keystone:identity-service
+    - - neutron-openvswitch:neutron-plugin-api
+      - neutron-api:neutron-plugin-api
+    - - neutron-api:shared-db
+      - mysql:shared-db
+    - - neutron-api:amqp
+      - rabbitmq-server:amqp
+    - - neutron-gateway:neutron-plugin-api
+      - neutron-api:neutron-plugin-api
+    - - glance:shared-db
+      - mysql:shared-db
+    - - glance:amqp
+      - rabbitmq-server:amqp
+    - - nova-cloud-controller:image-service
+      - glance:image-service
+    - - nova-compute:image-service
+      - glance:image-service
+    - - nova-cloud-controller:cloud-compute
+      - nova-compute:cloud-compute
+    - - nova-cloud-controller:amqp
+      - rabbitmq-server:amqp
+    - - nova-cloud-controller:quantum-network-service
+      - neutron-gateway:quantum-network-service
+    - - nova-compute:neutron-plugin
+      - neutron-openvswitch:neutron-plugin
+    - - neutron-openvswitch:amqp
+      - rabbitmq-server:amqp
+    - - openstack-dashboard:identity-service
+      - keystone:identity-service
+    - - nova-cloud-controller:shared-db
+      - mysql:shared-db
+    - - nova-cloud-controller:neutron-api
+      - neutron-api:neutron-api
+    - - 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
+    - - ntp:juju-info
+      - nova-compute:juju-info
+    - - ntp:juju-info
+      - neutron-gateway:juju-info
+    - - ceph-radosgw:mon
+      - ceph:radosgw
+    - - ceph-radosgw:identity-service
+      - keystone:identity-service
+    - - 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
+
   services:
+    hacluster-keystone:
+      charm: "local:trusty/hacluster"
+      options:
+        corosync_key: |
+          'QisjNpoKHLkvyc3PEdDHP5VZjgD0kOk9t0ABPWmCELlu5AgWgnW6bJd34BVXO7VhW+3ZwNQM3W+bZ3pl28ftY4ki4N/S0KLFNia5egFgiA3AH2QXLnokS7OYXuu6GMJJ1S5mDe6P5zU+tfJe/Mebq24u7CgR0gAvohSPRdDTwdY='
+    hacluster-horizon:
+      charm: "local:trusty/hacluster"
+      options:
+        corosync_key: |
+          'aCVPHw6XYne+Hxv0WPiM3+yEfeIxs0Ly0EMKB494Rdzjf5rE52GcXqqxuvIa/nXJ4GCR+UdKk9FEwcASfYkeu3HDWUld9uTE6pOc+ibWYnybNH7VBfEHW8h9YmQKs3HD2T3wlTcS2irU4CUW7/IKNok4etYdM3iFn1K2ReSGXEI='
+    hacluster-nova:
+      charm: "local:trusty/hacluster"
+      options:
+        corosync_key: |
+          'gel86qmEze8dYKYbfqIgRpqapJpKtdYL2hxC1y5nWYBPq7EMf6V8mF01IjeUkSRs14CUDrsPpT4PWeom7EOY2fleuLx/aIuqQUfEDkhf/gvaz7BaU4hrmTCoDBK7/HvEwY+/wu4qkEeckzSRPsm9MYzqnLRshh8yjZJ70xU/mmk='
+    hacluster-neutron:
+      charm: "local:trusty/hacluster"
+      options:
+        corosync_key: |
+          'KNhb4++3jlllbnscS5D3qdzOJDsQPEeZ7zOLZJHbkKrRjX9gRCijVVOiv2JCvq03HqQ7LIufQzWGl9Za8qh0f6QmQ3XhFh/Cb/3WaYFj+tEf0zArWv+8miswmM1z4eyTSrTWBq0dTgx1z96wjBxP5HV0+1LWW+3Ei4oZWyRGeR0='
+    hacluster-glance:
+      charm: "local:trusty/hacluster"
+      options:
+        corosync_key: |
+          'el1dd8107J5mwQDPS7tEJPZrr0XFfL95+Tku/QG90W5Q5f5SP4W8TRfKvddGmZWZl2lVd1neG5WqaHa1mq/aScJpoflzVAJCvshN7Gd2AjHhLNNugeI8S90j/7wrKUhqiCAlkKaeri2xs5bB5PZ7Z9AHuNZL7SW1al8lxrKhUFI='
     ceilometer:
       charm: "local:trusty/ceilometer"
       num_units: 3
@@ -183,151 +333,3 @@ openstack-phase2:
       charm: "local:trusty/heat"
       to:
         - "lxc:nodes=0"
-    hacluster-keystone:
-      charm: "local:trusty/hacluster"
-      options:
-        corosync_key: |
-          'QisjNpoKHLkvyc3PEdDHP5VZjgD0kOk9t0ABPWmCELlu5AgWgnW6bJd34BVXO7VhW+3ZwNQM3W+bZ3pl28ftY4ki4N/S0KLFNia5egFgiA3AH2QXLnokS7OYXuu6GMJJ1S5mDe6P5zU+tfJe/Mebq24u7CgR0gAvohSPRdDTwdY='
-    hacluster-horizon:
-      charm: "local:trusty/hacluster"
-      options:
-        corosync_key: |
-          'aCVPHw6XYne+Hxv0WPiM3+yEfeIxs0Ly0EMKB494Rdzjf5rE52GcXqqxuvIa/nXJ4GCR+UdKk9FEwcASfYkeu3HDWUld9uTE6pOc+ibWYnybNH7VBfEHW8h9YmQKs3HD2T3wlTcS2irU4CUW7/IKNok4etYdM3iFn1K2ReSGXEI='
-    hacluster-nova:
-      charm: "local:trusty/hacluster"
-      options:
-        corosync_key: |
-          'gel86qmEze8dYKYbfqIgRpqapJpKtdYL2hxC1y5nWYBPq7EMf6V8mF01IjeUkSRs14CUDrsPpT4PWeom7EOY2fleuLx/aIuqQUfEDkhf/gvaz7BaU4hrmTCoDBK7/HvEwY+/wu4qkEeckzSRPsm9MYzqnLRshh8yjZJ70xU/mmk='
-    hacluster-neutron:
-      charm: "local:trusty/hacluster"
-      options:
-        corosync_key: |
-          'KNhb4++3jlllbnscS5D3qdzOJDsQPEeZ7zOLZJHbkKrRjX9gRCijVVOiv2JCvq03HqQ7LIufQzWGl9Za8qh0f6QmQ3XhFh/Cb/3WaYFj+tEf0zArWv+8miswmM1z4eyTSrTWBq0dTgx1z96wjBxP5HV0+1LWW+3Ei4oZWyRGeR0='
-    hacluster-glance:
-      charm: "local:trusty/hacluster"
-      options:
-        corosync_key: |
-          'el1dd8107J5mwQDPS7tEJPZrr0XFfL95+Tku/QG90W5Q5f5SP4W8TRfKvddGmZWZl2lVd1neG5WqaHa1mq/aScJpoflzVAJCvshN7Gd2AjHhLNNugeI8S90j/7wrKUhqiCAlkKaeri2xs5bB5PZ7Z9AHuNZL7SW1al8lxrKhUFI='
-  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
-    - - nova-compute:amqp
-      - rabbitmq-server:amqp
-    - - neutron-gateway:amqp
-      - rabbitmq-server:amqp
-    - - keystone:shared-db
-      - mysql:shared-db
-    - - nova-cloud-controller:identity-service
-      - keystone:identity-service
-    - - glance:identity-service
-      - keystone:identity-service
-    - - neutron-api:identity-service
-      - keystone:identity-service
-    - - neutron-openvswitch:neutron-plugin-api
-      - neutron-api:neutron-plugin-api
-    - - neutron-api:shared-db
-      - mysql:shared-db
-    - - neutron-api:amqp
-      - rabbitmq-server:amqp
-    - - neutron-gateway:neutron-plugin-api
-      - neutron-api:neutron-plugin-api
-    - - glance:shared-db
-      - mysql:shared-db
-    - - glance:amqp
-      - rabbitmq-server:amqp
-    - - nova-cloud-controller:image-service
-      - glance:image-service
-    - - nova-compute:image-service
-      - glance:image-service
-    - - nova-cloud-controller:cloud-compute
-      - nova-compute:cloud-compute
-    - - nova-cloud-controller:amqp
-      - rabbitmq-server:amqp
-    - - nova-cloud-controller:quantum-network-service
-      - neutron-gateway:quantum-network-service
-    - - nova-compute:neutron-plugin
-      - neutron-openvswitch:neutron-plugin
-    - - neutron-openvswitch:amqp
-      - rabbitmq-server:amqp
-    - - openstack-dashboard:identity-service
-      - keystone:identity-service
-    - - nova-cloud-controller:shared-db
-      - mysql:shared-db
-    - - nova-cloud-controller:neutron-api
-      - neutron-api:neutron-api
-    - - 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
-    - - ntp:juju-info
-      - nova-compute:juju-info
-    - - ntp:juju-info
-      - neutron-gateway:juju-info
-    - - ceph-radosgw:mon
-      - ceph:radosgw
-    - - ceph-radosgw:identity-service
-      - keystone:identity-service
-    - - 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
-
-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
-    #ext-port: "eth1"
-    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
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
index ba83ab6c..06792de5 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
@@ -1,4 +1,26 @@
 # 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
+    #ext-port: "eth1"
+    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:
@@ -10,8 +32,100 @@ openstack-phase1:
   relations:
     - - "ntp:juju-info"
       - "nodes:juju-info"
+
 openstack-phase2:
   inherits: openstack-phase1
+  relations:
+    - - nova-compute:amqp
+      - rabbitmq-server:amqp
+    - - neutron-gateway:amqp
+      - rabbitmq-server:amqp
+    - - keystone:shared-db
+      - mysql:shared-db
+    - - nova-cloud-controller:identity-service
+      - keystone:identity-service
+    - - glance:identity-service
+      - keystone:identity-service
+    - - neutron-api:identity-service
+      - keystone:identity-service
+    - - neutron-openvswitch:neutron-plugin-api
+      - neutron-api:neutron-plugin-api
+    - - neutron-api:shared-db
+      - mysql:shared-db
+    - - neutron-api:amqp
+      - rabbitmq-server:amqp
+    - - neutron-gateway:neutron-plugin-api
+      - neutron-api:neutron-plugin-api
+    - - glance:shared-db
+      - mysql:shared-db
+    - - glance:amqp
+      - rabbitmq-server:amqp
+    - - nova-cloud-controller:image-service
+      - glance:image-service
+    - - nova-compute:image-service
+      - glance:image-service
+    - - nova-cloud-controller:cloud-compute
+      - nova-compute:cloud-compute
+    - - nova-cloud-controller:amqp
+      - rabbitmq-server:amqp
+    - - nova-cloud-controller:quantum-network-service
+      - neutron-gateway:quantum-network-service
+    - - nova-compute:neutron-plugin
+      - neutron-openvswitch:neutron-plugin
+    - - neutron-openvswitch:amqp
+      - rabbitmq-server:amqp
+    - - openstack-dashboard:identity-service
+      - keystone:identity-service
+    - - nova-cloud-controller:shared-db
+      - mysql:shared-db
+    - - nova-cloud-controller:neutron-api
+      - neutron-api:neutron-api
+    - - 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
+    - - ntp:juju-info
+      - nova-compute:juju-info
+    - - ntp:juju-info
+      - neutron-gateway:juju-info
+    - - ceph-radosgw:mon
+      - ceph:radosgw
+    - - ceph-radosgw:identity-service
+      - keystone:identity-service
+    - - 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
   services:
     ceilometer:
       charm: "local:trusty/ceilometer"
@@ -141,115 +255,3 @@ openstack-phase2:
       charm: "local:trusty/heat"
       to:
         - "lxc:nodes=0"
-  relations:
-    - - nova-compute:amqp
-      - rabbitmq-server:amqp
-    - - neutron-gateway:amqp
-      - rabbitmq-server:amqp
-    - - keystone:shared-db
-      - mysql:shared-db
-    - - nova-cloud-controller:identity-service
-      - keystone:identity-service
-    - - glance:identity-service
-      - keystone:identity-service
-    - - neutron-api:identity-service
-      - keystone:identity-service
-    - - neutron-openvswitch:neutron-plugin-api
-      - neutron-api:neutron-plugin-api
-    - - neutron-api:shared-db
-      - mysql:shared-db
-    - - neutron-api:amqp
-      - rabbitmq-server:amqp
-    - - neutron-gateway:neutron-plugin-api
-      - neutron-api:neutron-plugin-api
-    - - glance:shared-db
-      - mysql:shared-db
-    - - glance:amqp
-      - rabbitmq-server:amqp
-    - - nova-cloud-controller:image-service
-      - glance:image-service
-    - - nova-compute:image-service
-      - glance:image-service
-    - - nova-cloud-controller:cloud-compute
-      - nova-compute:cloud-compute
-    - - nova-cloud-controller:amqp
-      - rabbitmq-server:amqp
-    - - nova-cloud-controller:quantum-network-service
-      - neutron-gateway:quantum-network-service
-    - - nova-compute:neutron-plugin
-      - neutron-openvswitch:neutron-plugin
-    - - neutron-openvswitch:amqp
-      - rabbitmq-server:amqp
-    - - openstack-dashboard:identity-service
-      - keystone:identity-service
-    - - nova-cloud-controller:shared-db
-      - mysql:shared-db
-    - - nova-cloud-controller:neutron-api
-      - neutron-api:neutron-api
-    - - 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
-    - - ntp:juju-info
-      - nova-compute:juju-info
-    - - ntp:juju-info
-      - neutron-gateway:juju-info
-    - - ceph-radosgw:mon
-      - ceph:radosgw
-    - - ceph-radosgw:identity-service
-      - keystone:identity-service
-    - - 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
-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
-    #ext-port: "eth1"
-    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
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
index 15ee33ec..3661b862 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
@@ -1,4 +1,26 @@
 # 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
+    #ext-port: "eth1"
+    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:
@@ -10,8 +32,96 @@ openstack-phase1:
   relations:
     - - "ntp:juju-info"
       - "nodes:juju-info"
+
 openstack-phase2:
   inherits: openstack-phase1
+  relations:
+    - - neutron-openvswitch:neutron-plugin-api
+      - neutron-api:neutron-plugin-api
+    - - nova-compute:neutron-plugin
+      - neutron-openvswitch:neutron-plugin
+    - - neutron-openvswitch:amqp
+      - rabbitmq-server:amqp
+    - - "keystone:shared-db"
+      - "mysql:shared-db"
+    - - "nova-cloud-controller:shared-db"
+      - "mysql:shared-db"
+    - - "nova-cloud-controller:amqp"
+      - "rabbitmq-server:amqp"
+    - - "nova-cloud-controller:image-service"
+      - "glance:image-service"
+    - - "nova-cloud-controller:identity-service"
+      - "keystone:identity-service"
+    - - "nova-cloud-controller:cloud-compute"
+      - "nova-compute:cloud-compute"
+    - - "nova-compute:amqp"
+      - "rabbitmq-server:amqp"
+    - - "nova-compute:image-service"
+      - "glance:image-service"
+    - - "glance:shared-db"
+      - "mysql:shared-db"
+    - - "glance:identity-service"
+      - "keystone:identity-service"
+    - - "glance:amqp"
+      - "rabbitmq-server:amqp"
+    - - "openstack-dashboard:identity-service"
+      - "keystone:identity-service"
+    - - "neutron-api:shared-db"
+      - "mysql:shared-db"
+    - - "neutron-api:amqp"
+      - "rabbitmq-server:amqp"
+    - - "nova-cloud-controller:neutron-api"
+      - "neutron-api:neutron-api"
+    - - "neutron-api:identity-service"
+      - "keystone:identity-service"
+    - - "neutron-gateway:amqp"
+      - "rabbitmq-server:amqp"
+    - - "neutron-gateway:neutron-plugin-api"
+      - "neutron-api:neutron-plugin-api"
+    - - "nova-cloud-controller:quantum-network-service"
+      - "neutron-gateway:quantum-network-service"
+    - - "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"
   services:
     mysql:
       charm: "local:trusty/percona-cluster"
@@ -147,113 +257,3 @@ openstack-phase2:
         #default-socket-memory: 1024
         #defualt-socket-cores: 1
         #dpdk-driver: uio_pci_generic
-  relations:
-    - - neutron-openvswitch:neutron-plugin-api
-      - neutron-api:neutron-plugin-api
-    - - nova-compute:neutron-plugin
-      - neutron-openvswitch:neutron-plugin
-    - - neutron-openvswitch:amqp
-      - rabbitmq-server:amqp
-    - - "keystone:shared-db"
-      - "mysql:shared-db"
-    - - "nova-cloud-controller:shared-db"
-      - "mysql:shared-db"
-    - - "nova-cloud-controller:amqp"
-      - "rabbitmq-server:amqp"
-    - - "nova-cloud-controller:image-service"
-      - "glance:image-service"
-    - - "nova-cloud-controller:identity-service"
-      - "keystone:identity-service"
-    - - "nova-cloud-controller:cloud-compute"
-      - "nova-compute:cloud-compute"
-    - - "nova-compute:amqp"
-      - "rabbitmq-server:amqp"
-    - - "nova-compute:image-service"
-      - "glance:image-service"
-    - - "glance:shared-db"
-      - "mysql:shared-db"
-    - - "glance:identity-service"
-      - "keystone:identity-service"
-    - - "glance:amqp"
-      - "rabbitmq-server:amqp"
-    - - "openstack-dashboard:identity-service"
-      - "keystone:identity-service"
-    - - "neutron-api:shared-db"
-      - "mysql:shared-db"
-    - - "neutron-api:amqp"
-      - "rabbitmq-server:amqp"
-    - - "nova-cloud-controller:neutron-api"
-      - "neutron-api:neutron-api"
-    - - "neutron-api:identity-service"
-      - "keystone:identity-service"
-    - - "neutron-gateway:amqp"
-      - "rabbitmq-server:amqp"
-    - - "neutron-gateway:neutron-plugin-api"
-      - "neutron-api:neutron-plugin-api"
-    - - "nova-cloud-controller:quantum-network-service"
-      - "neutron-gateway:quantum-network-service"
-    - - "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"
-
-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
-    #ext-port: "eth1"
-    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
-