added ssl support based on default.

[joid.git] / ci / config_tpl / juju2 / bundle_tpl / ceph.yaml

diff --git a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
index f700594..c46abeb 100644 (file)
--- a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
@@ -1,16 +1,18 @@
 {% if opnfv.storage_dict.ceph is defined %}
-    ceph:
-      charm: "./{{ ubuntu.release }}/ceph"
+    ceph-mon:
+      charm: "./{{ ubuntu.release }}/ceph-mon"
       num_units: {{ unit_ceph_qty() }}
+{% if os.service.bindings %}
+      bindings:
+        "": *oam-space
+        public: *ceph-public-space
+        cluster: *ceph-cluster-space
+{% endif %}
       options:
-        monitor-count: {{ unit_ceph_qty() }}
-        fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
-        monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
+        expected-osd-count: {{ unit_ceph_qty() }}
+        source: *openstack-origin
 {% if os.network.ipv6 %}
         prefer-ipv6: {{ os.network.ipv6 }}
-{% endif %}
-{% if opnfv.spaces_dict.storage is defined %}
-        #ceph-cluster-network: {{ opnfv.spaces_dict.storage.cidr }}
 {% endif %}
       to:
 {% if os.hyperconverged %}
@@ -34,17 +36,25 @@
       num_units: {{ opnfv.units }}
 {% else %}
       num_units: 3
+{% endif %}
+{% if os.service.bindings %}
+      bindings:
+        "": *oam-space
+        public: *ceph-public-space
+        cluster: *ceph-cluster-space
 {% endif %}
       options:
-        osd-devices: {{ opnfv.storage_dict.ceph.disk }}
+        osd-devices: *osd-devices
+        osd-journal: *osd-journal
         osd-reformat: 'yes'
+        source: *openstack-origin
 {% if os.network.ipv6 %}
         prefer-ipv6: {{ os.network.ipv6 }}
 {% endif %}
       to:
 {% if os.hyperconverged %}
 {% for unit_id in range(0, opnfv.units) %}
-        - "nodes/{{ unit_id }}"
+         - "nodes/{{ unit_id }}"
 {% endfor %}
 {% else %}
 {% if os.ha.mode == 'ha' %}
@@ -59,19 +69,39 @@
 {% endif %}
     ceph-radosgw:
       charm: "./{{ ubuntu.release }}/ceph-radosgw"
-      num_units: {{ unit_qty() if os.beta.hacluster_ceph_radosgw else 1 }}
+      num_units: {{ unit_qty() }}
+{% if os.service.bindings %}
+      constraints: *ceph-access-constr
+      bindings:
+        "": *oam-space
+        public: *public-space
+        admin: *admin-space
+        internal: *internal-space
+        mon: *ceph-public-space
+{% endif %}
       options:
-        region: {{ os.region }}
-        use-embedded-webserver: true
-        operator-roles: "Member,admin"
+        region: *openstack-region
+        operator-roles: "Member,admin,SwiftOperator"
+        source: *openstack-origin
 {% if os.network.ipv6 %}
         prefer-ipv6: {{ os.network.ipv6 }}
 {% endif %}
 {% if opnfv.storage_dict.ceph is defined %}
         ceph-osd-replication-count: {{ unit_ceph_qty() }}
+{% endif %}
+{% if os.ha.mode == 'ha' %}
+        vip: *rados-gateway-vip
+{% endif %}
+{% if os.api.ssl %}
+        ssl_ca: *ssl_ca
+        ssl_cert: *ssl_cert
+        ssl_key: *ssl_key
+        os-public-hostname: *hostname_radosgw_public
+        os-admin-hostname: *hostname_radosgw_public
+        os-internal-hostname: *hostname_radosgw_public
 {% endif %}
       to:
-{% for unit_id in to_select(unit_qty() if os.beta.hacluster_ceph_radosgw else 1) %}
+{% for unit_id in to_select(unit_qty()) %}
         - "lxd:nodes/{{ unit_id }}"
 {% endfor %}
 {% endif %}