modified as per converged architecture from Canonical.

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

1 files changed, 26 insertions, 41 deletions

diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml
index 28bb08d6..49ae7a62 100644
--- a/ci/odl/juju-deployer/ovs-odl-tip.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml
@@ -2,48 +2,40 @@
 openstack-phase1:
   series: trusty
   services:
-    nodes-api:
-      charm: "cs:trusty/ubuntu"
-      num_units: 1
-      constraints: tags=control
-    nodes-compute:
+    nodes:
       charm: "cs:trusty/ubuntu"
       num_units: 2
-      constraints: tags=compute
     ntp:
       charm: "local:trusty/ntp"
   relations:
     - - "ntp:juju-info"
-      - "nodes-api:juju-info"
+      - "nodes:juju-info"
     - - "ntp:juju-info"
-      - "nodes-compute:juju-info"
+      - "nodes:juju-info"
 openstack-phase2:
   inherits: openstack-phase1
   services:
     mysql:
       charm: "local:trusty/percona-cluster"
-      num_units: 1
       options:
         dataset-size: 2G
         max-connections: 10000
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=0"
     ceilometer:
       charm: "local:trusty/ceilometer"
-      num_units: 1
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=1"
     ceilometer-agent:
       charm: "local:trusty/ceilometer-agent"
     mongodb:
       charm: "local:trusty/mongodb"
-      num_units: 1
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=0"
     heat:
       charm: "local:trusty/heat"
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=1"
     ceph:
       charm: "local:trusty/ceph"
       num_units: 2
@@ -51,63 +43,59 @@ openstack-phase2:
         fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
         monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
         osd-devices: ""
-        monitor-count: 1
+        monitor-count: 2
 #        osd-reformat: 'no'
 #        ceph-cluster-network: 192.168.0.0/24
 #        ceph-public-network: 192.168.0.0/24
       to:
-        - "lxc:nodes-api=0"
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=0"
+        - "lxc:nodes=1"
     ceph-osd:
       charm: "local:trusty/ceph-osd"
-      num_units: 1
+      num_units: 2
       options:
         osd-devices: /srv
         osd-reformat: 'yes'
       to:
-        - "nodes-compute=0"
+        - "nodes=0"
+        - "nodes=1"
     ceph-radosgw:
       charm: "local:trusty/ceph-radosgw"
-      num_units: 1
       options:
         use-embedded-webserver: true
         operator-roles: "Member,admin"
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=1"
     cinder:
       charm: "local:trusty/cinder"
-      num_units: 1
       options:
         block-device: None
         glance-api-version: 2
 #        ha-mcastport: 5401
 #        openstack-origin-git: include-file://cinder-master.yaml
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=0"
     cinder-ceph:
       charm: "local:trusty/cinder-ceph"
     rabbitmq-server:
       charm: local:trusty/rabbitmq-server
-      num_units: 1
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=1"
     keystone:
       charm: local:trusty/keystone
-      num_units: 1
       options:
         openstack-origin-git: include-file://keystone-master.yaml
         admin-password: openstack
         admin-token: admin
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=1"
     openstack-dashboard:
       charm: local:trusty/openstack-dashboard
-      num_units: 1
       options:
         openstack-origin-git: include-file://horizon-master.yaml
         secret: admin
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=0"
     nova-compute:
       charm: local:trusty/nova-compute
       num_units: 2
@@ -118,25 +106,23 @@ openstack-phase2:
         manage-neutron-plugin-legacy-mode: false
         migration-auth-type: ssh
       to:
-        - "nodes-compute=0"
-        - "nodes-compute=1"
+        - "nodes=0"
+        - "nodes=1"
     nova-cloud-controller:
       charm: local:trusty/nova-cloud-controller
-      num_units: 1
       options:
         openstack-origin-git: include-file://nova-master.yaml
         console-access-protocol: novnc
         network-manager: Neutron
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=1"
     neutron-api:
       charm: local:trusty/neutron-api
-      num_units: 1
       options:
         neutron-security-groups: True
         flat-network-providers: "*"
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=0"
     neutron-gateway:
       charm: local:trusty/neutron-gateway
       options:
@@ -145,7 +131,7 @@ openstack-phase2:
         plugin: ovs-odl
         instance-mtu: 1400
       to:
-        - "nodes-api=0"
+        - "nodes=0"
     odl-controller:
       charm: local:trusty/odl-controller
       options:
@@ -154,18 +140,17 @@ openstack-phase2:
         http-proxy: "http://squid.internal:3128"
         https-proxy: "http://squid.internal:3128"
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=1"
     glance:
       charm: local:trusty/glance
-      num_units: 1
       options:
         openstack-origin-git: include-file://glance-master.yaml
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=0"
     opnfv-promise:
       branch: lp:~narindergupta/charms/trusty/promise/trunk
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=1"
     neutron-api-odl:
       charm: local:trusty/neutron-api-odl
       options: