modified to accomodate OCL

[joid.git] / ci / config_tpl / juju2 / bundle_tpl / cinder.yaml

diff --git a/ci/config_tpl/juju2/bundle_tpl/cinder.yaml b/ci/config_tpl/juju2/bundle_tpl/cinder.yaml
index 18313cb..cce12e0 100644 (file)
--- a/ci/config_tpl/juju2/bundle_tpl/cinder.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/cinder.yaml
@@ -5,20 +5,22 @@
 {% else %}
       num_units: {{ unit_qty() }}
 {% endif %}
+{% if os.service.bindings %}
       bindings:
-        internal: internal
-{% if opnfv.spaces_dict.data is defined %}
-        admin: admin
-{% else %}
-        admin: internal
-{% endif %}
+        internal: internal-api
+        admin: internal-api
+        shared-db: internal-api
 {% if opnfv.spaces_dict.public is defined %}
-        public: public
+        public: public-api
 {% else %}
-        public: internal
+        public: internal-api
+{% endif %}
 {% endif %}
       options:
         openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
+{% if os.git_repo.origin_git %}
+        openstack-origin-git: "{{ os.git_repo.branch }}"
+{% endif %}
         region: {{ os.region }}
         block-device: None
         glance-api-version: 2