openstack/openstack-helm
Code Issues Proposed changes

Merge pull request #112 from alanmeadows/uuid_provider

Browse Source 
Allow specifying the keystone token provider
This commit is contained in:
Brandon B. Jozsa 2017-01-19 17:01:03 -06:00 committed by GitHub
commit 230d41fdbd
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
keystone/templates/etc/_keystone.conf.tpl
View File

@ -1,5 +1,5 @@
[DEFAULT] [DEFAULT]
debug = {{ .Values.misc.debug }} debug = {{ .Values.api.default.debug }}
use_syslog = False use_syslog = False
use_stderr = True use_stderr = True
@ -10,6 +10,9 @@ max_retries = -1
[memcache] [memcache]
servers = {{ include "memcached_host" . }}:11211 servers = {{ include "memcached_host" . }}:11211
[token]
provider = {{ .Values.api.token.provider }}
[cache] [cache]
backend = dogpile.cache.memcached backend = dogpile.cache.memcached
memcache_servers = {{ include "memcached_host" . }}:11211 memcache_servers = {{ include "memcached_host" . }}:11211

9
keystone/values.yaml
View File

@ -31,6 +31,12 @@ keystone:
admin_password: password admin_password: password
admin_project_name: admin admin_project_name: admin
api:
default:
debug: false
token:
provider: uuid
network: network:
port: port:
admin: 35357 admin: 35357
@ -52,9 +58,6 @@ database:
keystone_password: password keystone_password: password
keystone_user: keystone keystone_user: keystone
misc:
debug: false
dependencies: dependencies:
api: api:
jobs: jobs: