modified to fix the orange pod issue regarding glance where ceph

[joid.git] / ci / nosdn / juju-deployer / ovs-nosdn-ha.yaml

diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
index 29a04af..f22bd53 100644 (file)
--- a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
@@ -31,28 +31,28 @@ openstack-phase2:
       branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next"
     ceph:
       branch: "lp:~openstack-charmers/charms/trusty/ceph/next"
-      num_units: 2
+      num_units: 3
       options:
-        monitor-count: 1
+        monitor-count: 3
         fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
         monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
-        osd-devices: /srv
-        osd-reformat: 'yes'
+        osd-devices: ""
+#        osd-reformat: 'yes'
 #        ceph-cluster-network: 192.168.0.0/24
 #        ceph-public-network: 192.168.0.0/24
       to:
-        - "nodes-compute=0"
-        - "nodes-compute=1"
+        - "lxc:nodes-api=2"
+        - "lxc:nodes-api=0"
+        - "lxc:nodes-api=1"
     ceph-osd:
       branch: "lp:~openstack-charmers/charms/trusty/ceph-osd/next"
-      num_units: 3
+      num_units: 2
       options:
         osd-devices: /srv
         osd-reformat: 'yes'
       to:
-        - "nodes-api=0"
-        - "nodes-api=1"
-        - "nodes-api=2"
+        - "nodes-compute=0"
+        - "nodes-compute=1"
     ceph-radosgw:
       branch: "lp:~openstack-charmers/charms/trusty/ceph-radosgw/next"
       num_units: 1
@@ -324,6 +324,7 @@ trusty-liberty:
   inherits: openstack-phase2
   overrides:
     #os-data-network: 10.4.8.0/21
+    #ceph-cluster-network: 10.4.0.0/21
     #prefer-ipv6: true
     region: Canonical
     source: "cloud:trusty-liberty"
@@ -342,6 +343,7 @@ trusty-kilo:
   inherits: openstack-phase2
   overrides:
     #os-data-network: 10.4.8.0/21
+    #ceph-cluster-network: 10.4.0.0/21
     #prefer-ipv6: true
     region: Canonical
     source: "cloud:trusty-kilo"
@@ -360,6 +362,7 @@ trusty-juno:
   inherits: openstack-phase2
   overrides:
     #os-data-network: 10.4.8.0/21
+    #ceph-cluster-network: 10.4.0.0/21
     #prefer-ipv6: true
     region: Canonical
     source: "cloud:trusty-juno"