1 files changed, 34 insertions, 23 deletions
diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml
index c2764678..d8ac0f80 100644
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@ -8,7 +8,7 @@ openstack-phase1:
       constraints: tags=control
     nodes-compute:
       charm: "local:trusty/ubuntu-nodes-compute"
-      num_units: 1
+      num_units: 2
       constraints: tags=compute
     "ntp": 
       charm: "cs:trusty/ntp"
@@ -86,7 +86,7 @@ openstack-phase2:
         - "lxc:nodes-api=0"
     ceph:
       charm: cs:trusty/ceph
-      num_units: 1
+      num_units: 2
       options:
         fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
         monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
@@ -97,22 +97,26 @@ openstack-phase2:
 #        ceph-public-network: 192.168.0.0/24
       to:
         - "nodes-compute=0"
-#        - "nodes-compute=1"
-#    ceph-osd:
-#      charm: cs:trusty/ceph-osd
-#      num_units: 1
-#      options:
-#        osd-devices: /dev/sdb
-#        osd-reformat: 'yes'
-#      to:
-#        - "lxc:nodes-api=0"
-#    ceph-radosgw:
-#      charm: cs:trusty/ceph-radosgw
-#      num_units: 1
-#      options:
-#        use-embedded-webserver: true
-#      to:
-#        - "lxc:nodes-api=0"
+        - "nodes-compute=1"
+    ceph-osd:
+      charm: cs:trusty/ceph-osd
+      num_units: 3
+      options:
+        osd-devices: /srv
+        osd-reformat: 'yes'
+      to:
+        - "nodes-api=0"
+        - "nodes-api=1"
+        - "nodes-api=2"
+    ceph-radosgw:
+      charm: cs:trusty/ceph-radosgw
+      num_units: 3
+      options:
+        use-embedded-webserver: true
+      to:
+        - "lxc:nodes-api=0"
+        - "lxc:nodes-api=1"
+        - "lxc:nodes-api=2"
     cinder:
       charm: cs:trusty/cinder
       num_units: 3
@@ -158,13 +162,13 @@ openstack-phase2:
         - "lxc:nodes-api=2"
     "nova-compute": 
       branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
-      num_units: 1
+      num_units: 2
       options: 
         "enable-live-migration": False
         "manage-neutron-plugin-legacy-mode": False
       to:
         - "nodes-compute=0"
-#        - "nodes-compute=1"
+        - "nodes-compute=1"
 #        - "nodes-api=0"
 #        - "nodes-api=1"
 #        - "nodes-api=2"
@@ -324,6 +328,13 @@ openstack-phase2:
       - "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-liberty-nodes:
   inherits: openstack-phase1
   overrides:
@@ -339,7 +350,7 @@ trusty-liberty:
     source: "cloud:trusty-liberty"
     "openstack-origin": "cloud:trusty-liberty"
     series: trusty
-    ceph-osd-replication-count: 1
+    ceph-osd-replication-count: 2
 
 trusty-kilo-nodes:
   inherits: openstack-phase1
@@ -356,7 +367,7 @@ trusty-kilo:
     source: "cloud:trusty-kilo"
     "openstack-origin": "cloud:trusty-kilo"
     series: trusty
-    ceph-osd-replication-count: 1
+    ceph-osd-replication-count: 2
 
 
 trusty-juno-nodes:
@@ -374,6 +385,6 @@ trusty-juno:
     source: "cloud:trusty-juno"
     "openstack-origin": "cloud:trusty-juno"
     series: trusty
-    ceph-osd-replication-count: 1
+    ceph-osd-replication-count: 2