added ssl support based on default.

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

diff --git a/ci/config_tpl/juju2/bundle_tpl/cinder.yaml b/ci/config_tpl/juju2/bundle_tpl/cinder.yaml
index dd541f7..f7aee30 100644 (file)
--- a/ci/config_tpl/juju2/bundle_tpl/cinder.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/cinder.yaml
@@ -4,29 +4,43 @@
       num_units: 1
 {% else %}
       num_units: {{ unit_qty() }}
+{% endif %}
+{% if os.service.bindings %}
+      constraints: *ceph-access-constr
+      bindings:
+        "": *oam-space
+        public: *public-space
+        admin: *admin-space
+        internal: *internal-space
+        shared-db: *internal-space
 {% endif %}
       options:
-        openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
-        region: {{ os.region }}
+        openstack-origin: *openstack-origin
+{% if os.git_repo.origin_git %}
+        openstack-origin-git: "{{ os.git_repo.branch }}"
+{% endif %}
+        region: *openstack-region
         block-device: None
         glance-api-version: 2
-{% if os.beta.public_api %}
-        use-internal-endpoints: true
-{% endif %}
 {% if os.network.ipv6 %}
         prefer-ipv6: {{ os.network.ipv6 }}
 {% endif %}
 {% if os.api.worker_multiplier %}
-        worker-multiplier: {{ os.api.worker_multiplier }}
+        worker-multiplier: *worker-multiplier
 {% endif %}
 {% if opnfv.storage_dict.ceph is defined %}
         ceph-osd-replication-count: {{ unit_ceph_qty() }}
 {% endif %}
 {% if os.ha.mode == 'ha' %}
-        vip: {{ opnfv.vip.cinder }}
-{% endif %}
-{% if os.beta.public_api %}
-        os-public-hostname: api.{{ opnfv.domain }}
+        vip: *cinder-vip
+{% endif %}
+{% if os.api.ssl %}
+        ssl_ca: *ssl_ca
+        ssl_cert: *ssl_cert
+        ssl_key: *ssl_key
+        os-public-hostname: *hostname_cinder_public
+        os-internal-hostname: *hostname_cinder_public
+        os-admin-hostname: *hostname_cinder_public
 {% endif %}
       to:
 {% if opnfv.storage_dict.scaleio is defined %}