diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2017-05-01 14:32:51 -0500 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2017-05-02 15:31:47 -0500 |
| commit | c21e199a328c1d52232c213d2b243016cca46812 (patch) | |
| tree | 8b203ef25e00d7f87b695d7ba6eddfb86cf3a3f9 /ci/config_tpl/juju2/bundle_tpl/keystone.yaml | |
| parent | 6baf75637c2543d26e5887f3cb5903b10185e3e1 (diff) | |
added support for install from git repository. please modify
default_deployment_config.yaml to install from release repo
for ocata,master etc. Also user can define their own URL and
more information can be obtained at jujucharms.com
Change-Id: I4943dbf68c6d980b2a2da65417b16631df768b48
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
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 %} |