X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=ci%2Fconfig_tpl%2Fjuju2%2Fbundle_tpl%2Fglance.yaml;h=e765bc30009fa9a8152e7a3147ce28e9e136ce67;hb=31882813e2b47c840634aa5461d2cb4b8d58a172;hp=a34a0f0b4d9eaee221c97ab6d88477c38db779f7;hpb=2744c52b2a708a5a57f264f57f2fffe09dce4831;p=joid.git

diff --git a/ci/config_tpl/juju2/bundle_tpl/glance.yaml b/ci/config_tpl/juju2/bundle_tpl/glance.yaml
index a34a0f0b..e765bc30 100644
--- a/ci/config_tpl/juju2/bundle_tpl/glance.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/glance.yaml
@@ -2,26 +2,20 @@
       charm: "./{{ ubuntu.release }}/glance"
       num_units: {{ unit_qty() }}
 {% if os.service.bindings %}
+      constraints: *ceph-access-constr
       bindings:
-        internal: internal-api
-        shared-db: internal-api
-{% if opnfv.spaces_dict.public is defined %}
-        public: public-api
-{% if opnfv.spaces_dict.data is defined %}
-        admin: admin-api
-{% else %}
-        admin: internal-api
-{% endif %}
-{% else %}
-        public: internal-api
-        admin: internal-api
-{% endif %}
+        "": *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 }}
-{% if os.beta.public_api %}
-        use-internal-endpoints: true
+        openstack-origin: *openstack-origin
+        worker-multiplier: *worker-multiplier
+        region: *openstack-region
+{% if os.git_repo.origin_git %}
+        openstack-origin-git: "{{ os.git_repo.branch }}"
 {% endif %}
 {% if os.network.ipv6 %}
         prefer-ipv6: {{ os.network.ipv6 }}
@@ -29,14 +23,8 @@
 {% if opnfv.storage_dict.ceph is defined %}
         ceph-osd-replication-count: {{ unit_ceph_qty() }}
 {% endif %}
-{% if os.api.worker_multiplier %}
-        worker-multiplier: {{ os.api.worker_multiplier }}
-{% endif %}
 {% if os.ha.mode == 'ha' %}
         vip: {{ opnfv.vip.glance }}
-{% endif %}
-{% if os.beta.public_api %}
-        os-public-hostname: api.{{ opnfv.domain }}
 {% endif %}
       to:
 {% for unit_id in to_select() %}