diff options
| author | Jamie Lennox <jamielennox@redhat.com> | 2014-03-27 12:08:21 +1000 |
|---|---|---|
| committer | Jamie Lennox <jamielennox@redhat.com> | 2014-06-18 05:46:23 +1000 |
| commit | 6fd76f882f08c6c617851f460eab87d67e9df86c (patch) | |
| tree | 01c10b6d3db0b0e490b255b043470283f4f0d477 | |
| parent | 8f84d30c896438ed428cbd4ec30ca85279849d0a (diff) | |
| download | trove-6fd76f882f08c6c617851f460eab87d67e9df86c.tar.gz | |
Don't specify admin_token in paste config
This is not a value that is going to be useful on other systems and
shouldn't be included in the default or test pipelines.
The two similar commits were squashed together here.
(cherry picked from commit ae696056fbac7d74a395710934950e0013cd4d37)
(cherry picked from commit 9db80e79ea3e687000121729648af7e79b7b2d78)
Closes-Bug: #1299332
Change-Id: I714539b7536965fa08a3ddc64493b481df7397e3
| -rw-r--r-- | etc/trove/api-paste.ini | 1 | ||||
| -rw-r--r-- | etc/trove/api-paste.ini.test | 1 | ||||
| -rw-r--r-- | etc/trove/trove.conf.test | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/etc/trove/api-paste.ini b/etc/trove/api-paste.ini index 96edbea7..9d2f75c5 100644 --- a/etc/trove/api-paste.ini +++ b/etc/trove/api-paste.ini @@ -18,7 +18,6 @@ paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory auth_host = 127.0.0.1 auth_port = 35357 auth_protocol = http -admin_token = be19c524ddc92109a224 # signing_dir is configurable, but the default behavior of the authtoken # middleware should be sufficient. It will create a temporary directory # in the home directory for the user the trove process is running as. diff --git a/etc/trove/api-paste.ini.test b/etc/trove/api-paste.ini.test index 978a4da5..7f935402 100644 --- a/etc/trove/api-paste.ini.test +++ b/etc/trove/api-paste.ini.test @@ -22,7 +22,6 @@ auth_host = 127.0.0.1 auth_port = 35357 auth_protocol = http auth_uri = http://127.0.0.1:5000/ -admin_token = be19c524ddc92109a224 signing_dir = /tmp/keystone-signing-trove [filter:authorization] diff --git a/etc/trove/trove.conf.test b/etc/trove/trove.conf.test index 80155e5a..3bbca60d 100644 --- a/etc/trove/trove.conf.test +++ b/etc/trove/trove.conf.test @@ -159,7 +159,6 @@ auth_host = 127.0.0.1 auth_port = 35357 auth_protocol = http auth_uri = http://127.0.0.1:5000/ -admin_token = be19c524ddc92109a224 [filter:authorization] paste.filter_factory = trove.common.auth:AuthorizationMiddleware.factory |