move to master branch of charm for few bug fixes.

[joid.git] / ci / config_tpl / bundle_tpl / glance.yaml

diff --git a/ci/config_tpl/bundle_tpl/glance.yaml b/ci/config_tpl/bundle_tpl/glance.yaml
index 31f9c3b..7ae7fcc 100644 (file)
--- a/ci/config_tpl/bundle_tpl/glance.yaml
+++ b/ci/config_tpl/bundle_tpl/glance.yaml
@@ -2,11 +2,21 @@
       charm: "local:{{ ubuntu.release }}/glance"
       num_units: {{ unit_qty() }}
       options:
+        openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
+        region: {{ os.region }}
+{% if os.beta.public_api %}
+        use-internal-endpoints: true
+{% endif %}
+{% if os.network.ipv6 %}
+        prefer-ipv6: {{ os.network.ipv6 }}
+{% endif %}
+{% 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' %}
-        haproxy-server-timeout: 10000
-        haproxy-client-timeout: 10000
-        haproxy-queue-timeout: 10000
-        haproxy-connect-timeout: 10000
         vip: {{ opnfv.vip.glance }}
 {% endif %}
 {% if os.beta.public_api %}