x/packstack
Code Issues Proposed changes

Made token_format configurable

Browse Source 
Fixes: rhbz#975153
Change-Id: Ia679324307d4091f8b8ca98b02ab81760d2b4f8a
This commit is contained in:
Martin Magr
2013-06-18 10:33:17 +02:00
parent 529f675d7f
commit 105f1b72c7
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packstack/plugins/keystone_100.py
View File

@@ -74,6 +74,18 @@ def initConfig(controllerObject):
"USE_DEFAULT" : True, "USE_DEFAULT" : True,
"NEED_CONFIRM" : False, "NEED_CONFIRM" : False,
"CONDITION" : False }, "CONDITION" : False },
{"CMD_OPTION" : "keystone-token-format",
"USAGE" : "Kestone token format. Use either UUID or PKI",
"PROMPT" : "Enter the Keystone token format.",
"OPTION_LIST" : ['UUID', 'PKI'],
"VALIDATORS" : [validators.validate_options],
"DEFAULT_VALUE" : 'PKI',
"MASK_INPUT" : False,
"LOOSE_VALIDATION": False,
"CONF_NAME" : 'CONFIG_KEYSTONE_TOKEN_FORMAT',
"USE_DEFAULT" : True,
"NEED_CONFIRM" : False,
"CONDITION" : False },
] ]
groupDict = { "GROUP_NAME" : "KEYSTONE", groupDict = { "GROUP_NAME" : "KEYSTONE",

2
packstack/puppet/templates/keystone.pp
View File

@@ -1,6 +1,7 @@
class {"keystone": class {"keystone":
admin_token => "%(CONFIG_KEYSTONE_ADMIN_TOKEN)s", admin_token => "%(CONFIG_KEYSTONE_ADMIN_TOKEN)s",
sql_connection => "mysql://keystone_admin:%(CONFIG_KEYSTONE_DB_PW)s@%(CONFIG_MYSQL_HOST)s/keystone", sql_connection => "mysql://keystone_admin:%(CONFIG_KEYSTONE_DB_PW)s@%(CONFIG_MYSQL_HOST)s/keystone",
token_format => "%(CONFIG_KEYSTONE_TOKEN_FORMAT)s",
} }
class {"keystone::roles::admin": class {"keystone::roles::admin":
@@ -20,4 +21,3 @@ firewall { '001 keystone incoming':
dport => ['5000', '35357'], dport => ['5000', '35357'],
action => 'accept', action => 'accept',
} }