| commit | 63343093826e6f1bae96f73f4dd7c8c7db3385fd | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Mon Nov 25 17:08:09 2013 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Mon Nov 25 17:08:09 2013 +0000 |
| tree | 1d0e1485ad60a794bbbe9ffefcddd7b602102f2d | |
| parent | 94bfa18bd1a5f5623d7f8dc6cee014b38e069e40 [diff] | |
| parent | f653419b15d244fa7e01a101de93174d282185ed [diff] |
Merge "Keystone don't use deprecated token_format option"
diff --git a/lib/keystone b/lib/keystone index 4353eba..978577f 100644 --- a/lib/keystone +++ b/lib/keystone
@@ -179,7 +179,6 @@ fi iniset $KEYSTONE_CONF DEFAULT admin_token "$SERVICE_TOKEN" - iniset $KEYSTONE_CONF signing token_format "$KEYSTONE_TOKEN_FORMAT" if [[ "$KEYSTONE_TOKEN_FORMAT" = "UUID" ]]; then iniset $KEYSTONE_CONF token provider keystone.token.providers.uuid.Provider