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

diff --git a/ci/config_tpl/juju2/bundle_tpl/glance.yaml b/ci/config_tpl/juju2/bundle_tpl/glance.yaml
index 198cefb7..1eac2e07 100644
--- a/ci/config_tpl/juju2/bundle_tpl/glance.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/glance.yaml
@@ -2,6 +2,7 @@
       charm: "./{{ ubuntu.release }}/glance"
       num_units: {{ unit_qty() }}
 {% if os.service.bindings %}
+      constraints: *ceph-access-constr
       bindings:
         "": *oam-space
         public: *public-space
@@ -9,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 %}
@@ -24,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() %}