1 files changed, 41 insertions, 63 deletions
diff --git a/ci/odl/juju-deployer/ovs-odl-nonha.yaml b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
index 124de4a8..a4d0ba12 100644
--- a/ci/odl/juju-deployer/ovs-odl-nonha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
@@ -2,48 +2,38 @@
 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: 
+    ntp:
       charm: "local:trusty/ntp"
   relations:
     - - "ntp:juju-info"
-      - "nodes-api:juju-info"
-    - - "ntp:juju-info"
-      - "nodes-compute:juju-info"
-openstack-phase2: 
+      - "nodes:juju-info"
+openstack-phase2:
   inherits: openstack-phase1
-  services: 
-    mysql: 
+  services:
+    mysql:
       charm: "local:trusty/percona-cluster"
-      num_units: 1
-      options: 
+      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
@@ -56,8 +46,8 @@ openstack-phase2:
 #        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=0"
     ceph-osd:
       charm: "local:trusty/ceph-osd"
       num_units: 2
@@ -65,87 +55,77 @@ openstack-phase2:
         osd-devices: /srv
         osd-reformat: 'yes'
       to:
-        - "nodes-compute=0"
-        - "nodes-compute=1"
+        - "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=0"
     cinder:
       charm: "local:trusty/cinder"
-      num_units: 1
       options:
         block-device: None
         glance-api-version: 2
 #        ha-mcastport: 5401
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=1"
     cinder-ceph:
       charm: "local:trusty/cinder-ceph"
-    rabbitmq-server: 
+    rabbitmq-server:
       charm: "local:trusty/rabbitmq-server"
-      num_units: 1
       to:
-        - "lxc:nodes-api=0"
-    keystone: 
+        - "lxc:nodes=0"
+    keystone:
       charm: "local:trusty/keystone"
-      num_units: 1
-      options: 
+      options:
 #        ha-mcastport: 5402
         admin-password: openstack
         admin-token: admin
       to:
-        - "lxc:nodes-api=0"
-    openstack-dashboard: 
+        - "lxc:nodes=1"
+    openstack-dashboard:
       charm: "local:trusty/openstack-dashboard"
-      num_units: 1
-      options: 
+      options:
         secret: admin
         webroot: /
       to:
-        - "lxc:nodes-api=0"
-    nova-compute: 
+        - "lxc:nodes=1"
+    nova-compute:
       charm: local:trusty/nova-compute
       num_units: 2
-      options: 
+      options:
         enable-live-migration: true
         enable-resize: true
         manage-neutron-plugin-legacy-mode: false
         migration-auth-type: ssh
       to:
-        - "nodes-compute=0"
-        - "nodes-compute=1"
-#        - "nodes-api=0"
-#        - "nodes-api=1"
-#        - "nodes-api=2"
-    nova-cloud-controller: 
+        - "nodes=0"
+        - "nodes=1"
+    nova-cloud-controller:
       charm: local:trusty/nova-cloud-controller
-      num_units: 1
-      options: 
+      options:
         console-access-protocol: novnc
         network-manager: Neutron
       to:
-        - "lxc:nodes-api=0"
-    neutron-api: 
+        - "lxc:nodes=0"
+    neutron-api:
       charm: local:trusty/neutron-api
-      num_units: 1
       options:
         neutron-security-groups: True
         flat-network-providers: "*"
-      to: 
-        - "lxc:nodes-api=0"
+      to:
+        - "lxc:nodes=1"
     neutron-gateway:
       charm: local:trusty/neutron-gateway
       options:
         #ext-port: "eth1"
         plugin: ovs-odl
         instance-mtu: 1400
-      to:  
-        - "nodes-api=0"
+      to:
+        - "nodes=0"
     odl-controller:
       charm: local:trusty/odl-controller
       options:
@@ -154,16 +134,15 @@ openstack-phase2:
         http-proxy: "http://squid.internal:3128"
         https-proxy: "http://squid.internal:3128"
       to:
-        - "lxc:nodes-api=0"
-    glance: 
+        - "lxc:nodes=0"
+    glance:
       charm: local:trusty/glance
-      num_units: 1
       to:
-        - "lxc:nodes-api=0"
+        - "lxc:nodes=1"
     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:
@@ -284,4 +263,3 @@ trusty-mitaka:
     ceph-osd-replication-count: 2
     admin-role: admin
     keystone-admin-role: admin
-