type replaced Memeber with Member. Reducing the OSD to signle

[joid.git] / ci / opencontrail / juju-deployer / contrail-ha.yaml

diff --git a/ci/opencontrail/juju-deployer/contrail-ha.yaml b/ci/opencontrail/juju-deployer/contrail-ha.yaml
index c837eeb..90b85f6 100644 (file)
--- a/ci/opencontrail/juju-deployer/contrail-ha.yaml
+++ b/ci/opencontrail/juju-deployer/contrail-ha.yaml
@@ -17,15 +17,15 @@ openstack-phase1:
       num_units: 3
       series: precise
       to:
+        - "lxc:nodes-api=2"
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
-        - "lxc:nodes-api=2"
     cassandra:
       branch: lp:~stub/charms/trusty/cassandra/noauthentication
       num_units: 3
       to:
-        - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
+        - "lxc:nodes-api=0"
         - "lxc:nodes-api=2"
       options:
         authenticator: AllowAllAuthenticator
@@ -48,9 +48,9 @@ openstack-phase2:
         "sst-password": 127rc14t51
         vip: 10.4.1.15
       to:
+        - "lxc:nodes-api=2"
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
-        - "lxc:nodes-api=2"
     "hacluster-keystone":
       charm: "cs:trusty/hacluster"
       options:
@@ -87,9 +87,9 @@ openstack-phase2:
       options:
         vip: 10.4.1.14
       to:
+        - "lxc:nodes-api=2"
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
-        - "lxc:nodes-api=2"
     "ceilometer-agent":
       branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next"
     "mongodb":
@@ -117,21 +117,22 @@ openstack-phase2:
         - "nodes-compute=1"
     ceph-osd:
       charm: cs:trusty/ceph-osd
-      num_units: 1
+      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
+      num_units: 1
       options:
         use-embedded-webserver: true
+        operator-roles: "Member,admin"
       to:
         - "lxc:nodes-api=0"
-        - "lxc:nodes-api=1"
-        - "lxc:nodes-api=2"
 
     cinder:
       charm: cs:trusty/cinder
@@ -150,8 +151,8 @@ openstack-phase2:
       branch: lp:charms/trusty/rabbitmq-server
       num_units: 3
       to:
-        - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
+        - "lxc:nodes-api=0"
         - "lxc:nodes-api=2"
     "keystone": 
       branch: lp:charms/trusty/keystone
@@ -159,12 +160,11 @@ openstack-phase2:
       options: 
         "admin-password": openstack
         "admin-token": admin
-        "admin-role": admin
         vip: 10.4.1.13
       to:
+        - "lxc:nodes-api=2"
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
-        - "lxc:nodes-api=2"
     "openstack-dashboard": 
       branch: lp:charms/trusty/openstack-dashboard
       num_units: 3
@@ -198,8 +198,8 @@ openstack-phase2:
         "service-guard": true
         vip: 10.4.1.16
       to:
-        - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
+        - "lxc:nodes-api=0"
         - "lxc:nodes-api=2"
     "neutron-api": 
       branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
@@ -209,17 +209,17 @@ openstack-phase2:
         manage-neutron-plugin-legacy-mode: False
         vip: 10.4.1.17
       to: 
+        - "lxc:nodes-api=2"
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
-        - "lxc:nodes-api=2"
     "glance": 
       branch: lp:charms/trusty/glance
       num_units: 3
       options: 
         vip: 10.4.1.12
       to:
-        - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
+        - "lxc:nodes-api=0"
         - "lxc:nodes-api=2"
   relations:
     - [ "glance:ha", "hacluster-glance:ha" ]
@@ -356,6 +356,8 @@ trusty-liberty:
     openstack-origin: cloud:trusty-liberty
     source: "cloud:trusty-liberty"
     ceph-osd-replication-count: 2
+    admin-role: admin
+    keystone-admin-role: admin
 
 trusty-kilo-nodes:
   inherits: openstack-phase1
@@ -374,6 +376,8 @@ trusty-kilo:
     openstack-origin: cloud:trusty-kilo
     source: "cloud:trusty-kilo"
     ceph-osd-replication-count: 2
+    admin-role: admin
+    keystone-admin-role: admin
 
 trusty-juno-nodes:
   inherits: openstack-phase1
@@ -391,5 +395,6 @@ trusty-juno:
     openstack-origin: cloud:trusty-juno
     source: "cloud:trusty-juno"
     ceph-osd-replication-count: 2
-
+    admin-role: admin
+    keystone-admin-role: admin