Merge "modified on the lines of nosdn bundle tested. Only single gateway needed for...

[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 1c70e73..c837eeb 100644 (file)
--- a/ci/opencontrail/juju-deployer/contrail-ha.yaml
+++ b/ci/opencontrail/juju-deployer/contrail-ha.yaml
@@ -117,14 +117,12 @@ openstack-phase2:
         - "nodes-compute=1"
     ceph-osd:
       charm: cs:trusty/ceph-osd
-      num_units: 3
+      num_units: 1
       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
@@ -161,6 +159,7 @@ openstack-phase2:
       options: 
         "admin-password": openstack
         "admin-token": admin
+        "admin-role": admin
         vip: 10.4.1.13
       to:
         - "lxc:nodes-api=0"