summaryrefslogtreecommitdiffstats
path: root/ci/config_tpl/juju2/bundle_tpl/cinder.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'ci/config_tpl/juju2/bundle_tpl/cinder.yaml')
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/cinder.yaml11
1 files changed, 10 insertions, 1 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/cinder.yaml b/ci/config_tpl/juju2/bundle_tpl/cinder.yaml
index 12b6acc6..7486172b 100644
--- 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 %}
@@ -32,7 +33,15 @@
ceph-osd-replication-count: {{ unit_ceph_qty() }}
{% endif %}
{% if os.ha.mode == 'ha' %}
- vip: {{ opnfv.vip.cinder }}
+ 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 %}