From 105f1b72c7746f74f3793b22ba2a939bae958644 Mon Sep 17 00:00:00 2001 From: Martin Magr Date: Tue, 18 Jun 2013 10:33:17 +0200 Subject: [PATCH] Made token_format configurable Fixes: rhbz#975153 Change-Id: Ia679324307d4091f8b8ca98b02ab81760d2b4f8a --- packstack/plugins/keystone_100.py | 12 ++++++++++++ packstack/puppet/templates/keystone.pp | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/packstack/plugins/keystone_100.py b/packstack/plugins/keystone_100.py index 8eea25570..d2fb8fda5 100644 --- a/packstack/plugins/keystone_100.py +++ b/packstack/plugins/keystone_100.py @@ -74,6 +74,18 @@ def initConfig(controllerObject): "USE_DEFAULT" : True, "NEED_CONFIRM" : 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", diff --git a/packstack/puppet/templates/keystone.pp b/packstack/puppet/templates/keystone.pp index 708d7f2bf..e00bc6a02 100644 --- a/packstack/puppet/templates/keystone.pp +++ b/packstack/puppet/templates/keystone.pp @@ -1,6 +1,7 @@ class {"keystone": admin_token => "%(CONFIG_KEYSTONE_ADMIN_TOKEN)s", 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": @@ -20,4 +21,3 @@ firewall { '001 keystone incoming': dport => ['5000', '35357'], action => 'accept', } -