adding bionic support.

[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 0313f07..7486172 100644 (file)
--- a/ci/config_tpl/juju2/bundle_tpl/cinder.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/cinder.yaml
@@ -14,6 +14,7 @@
         internal: *internal-space
         shared-db: *internal-space
 {% endif %}
+      series: {{ ubuntu.release }}
       options:
         openstack-origin: *openstack-origin
 {% if os.git_repo.origin_git %}
@@ -22,7 +23,6 @@
         region: *openstack-region
         block-device: None
         glance-api-version: 2
-        use-internal-endpoints: True
 {% if os.network.ipv6 %}
         prefer-ipv6: {{ os.network.ipv6 }}
 {% endif %}
@@ -33,10 +33,15 @@
         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 %}