diff options
Diffstat (limited to 'ci/config_tpl/juju2/bundle_tpl/keystone.yaml')
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/keystone.yaml | 5 |
1 files changed, 4 insertions, 1 deletions
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 %} |