X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fconfig_tpl%2Fjuju2%2Fbundle_tpl%2Fkeystone.yaml;fp=ci%2Fconfig_tpl%2Fjuju2%2Fbundle_tpl%2Fkeystone.yaml;h=0d21f64994279bc910b630b8c28122e9ce8cac69;hb=c21e199a328c1d52232c213d2b243016cca46812;hp=4f81dc5f4363c581d819fdcc377832f390cef1c9;hpb=6baf75637c2543d26e5887f3cb5903b10185e3e1;p=joid.git

diff --git a/ci/config_tpl/juju2/bundle_tpl/keystone.yaml b/ci/config_tpl/juju2/bundle_tpl/keystone.yaml
index 4f81dc5f..0d21f649 100644
--- a/ci/config_tpl/juju2/bundle_tpl/keystone.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/keystone.yaml
@@ -14,10 +14,13 @@
 {% 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 }}
         admin-role: {{ os.admin.role }}
         keystone-admin-role: {{ os.admin.role }}
-        preferred-api-version: 2
+        preferred-api-version: 3
 {% if os.network.ipv6 %}
         prefer-ipv6: {{ os.network.ipv6 }}
 {% endif %}