Charm Helpers

Merge lp:~gnuoy/charm-helpers/keystone_authtoken into lp:charm-helpers

  1. keystone_authtoken
  2. Merge into devel
Proposed by Liam Young
Status: Merged
Merged at revision: 549
Proposed branch: lp:~gnuoy/charm-helpers/keystone_authtoken
Merge into: lp:charm-helpers
Diff against target: 44 lines (+15/-13)
2 files modified
charmhelpers/contrib/openstack/templates/section-keystone-authtoken (+5/-13)
charmhelpers/contrib/openstack/templates/section-keystone-authtoken-legacy (+10/-0)
To merge this branch: bzr merge lp:~gnuoy/charm-helpers/keystone_authtoken
Reviewer Review Type Date Requested Status
Billy Olsen Approve
Edward Hope-Morley Needs Information
Review via email: mp+289042@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Edward Hope-Morley (hopem) wrote :

One inline question

review: Needs Information
Revision history for this message
Liam Young (gnuoy) :
Revision history for this message
Billy Olsen (billy-olsen) wrote :

LGTM.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charmhelpers/contrib/openstack/templates/section-keystone-authtoken'
2--- charmhelpers/contrib/openstack/templates/section-keystone-authtoken 2016-02-12 09:47:40 +0000
3+++ charmhelpers/contrib/openstack/templates/section-keystone-authtoken 2016-03-15 12:59:42 +0000
4@@ -1,20 +1,12 @@
5 {% if auth_host -%}
6-{% if api_version == '3' -%}
7 [keystone_authtoken]
8-auth_url = {{ service_protocol }}://{{ service_host }}:{{ service_port }}
9+auth_uri = {{ service_protocol }}://{{ service_host }}:{{ service_port }}
10+auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}
11+auth_plugin = password
12+project_domain_id = default
13+user_domain_id = default
14 project_name = {{ admin_tenant_name }}
15 username = {{ admin_user }}
16 password = {{ admin_password }}
17-project_domain_name = default
18-user_domain_name = default
19-auth_plugin = password
20-{% else -%}
21-[keystone_authtoken]
22-identity_uri = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/{{ auth_admin_prefix }}
23-auth_uri = {{ service_protocol }}://{{ service_host }}:{{ service_port }}/{{ service_admin_prefix }}
24-admin_tenant_name = {{ admin_tenant_name }}
25-admin_user = {{ admin_user }}
26-admin_password = {{ admin_password }}
27 signing_dir = {{ signing_dir }}
28 {% endif -%}
29-{% endif -%}
30
31=== added file 'charmhelpers/contrib/openstack/templates/section-keystone-authtoken-legacy'
32--- charmhelpers/contrib/openstack/templates/section-keystone-authtoken-legacy 1970-01-01 00:00:00 +0000
33+++ charmhelpers/contrib/openstack/templates/section-keystone-authtoken-legacy 2016-03-15 12:59:42 +0000
34@@ -0,0 +1,10 @@
35+{% if auth_host -%}
36+[keystone_authtoken]
37+# Juno specific config (Bug #1557223)
38+auth_uri = {{ service_protocol }}://{{ service_host }}:{{ service_port }}/{{ service_admin_prefix }}
39+identity_uri = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}
40+admin_tenant_name = {{ admin_tenant_name }}
41+admin_user = {{ admin_user }}
42+admin_password = {{ admin_password }}
43+signing_dir = {{ signing_dir }}
44+{% endif -%}

Subscribers

People subscribed via source and target branches