X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fconfig_tpl%2Fjuju2%2Fbundle_tpl%2Fglance.yaml;h=1eac2e075195db134b2ef312dd16105b211c6db3;hb=f22b547900c6dacd937cdb1e53bacd39c6f56f6b;hp=725c436e5e9272cd4f15daebc4efcb69834d7dba;hpb=1ed595dd652e94e50b248e7416096b1caf4d76cc;p=joid.git

diff --git a/ci/config_tpl/juju2/bundle_tpl/glance.yaml b/ci/config_tpl/juju2/bundle_tpl/glance.yaml
index 725c436e..1eac2e07 100644
--- a/ci/config_tpl/juju2/bundle_tpl/glance.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/glance.yaml
@@ -10,11 +10,11 @@
         internal: *internal-space
         shared-db: *internal-space
 {% endif %}
+      series: {{ ubuntu.release }}
       options:
         openstack-origin: *openstack-origin
         worker-multiplier: *worker-multiplier
         region: *openstack-region
-        use-internal-endpoints: True
 {% if os.git_repo.origin_git %}
         openstack-origin-git: "{{ os.git_repo.branch }}"
 {% endif %}
@@ -25,10 +25,15 @@
         ceph-osd-replication-count: {{ unit_ceph_qty() }}
 {% endif %}
 {% if os.ha.mode == 'ha' %}
-        vip: {{ opnfv.vip.glance }}
+        vip: *glance-vip
 {% endif %}
-{% if os.beta.public_api %}
-        os-public-hostname: api.{{ opnfv.domain }}
+{% if os.api.ssl %}
+        ssl_ca: *ssl_ca
+        ssl_cert: *ssl_cert
+        ssl_key: *ssl_key
+        os-public-hostname: *hostname_glance_public
+        os-internal-hostname: *hostname_glance_public
+        os-admin-hostname: *hostname_glance_public
 {% endif %}
       to:
 {% for unit_id in to_select() %}