diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-07-31 14:02:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-07-31 14:02:55 +0000 |
| commit | 89eaad2d2b0ddaf0857e7fb0a3b6b09d89f89642 (patch) | |
| tree | 2c12787aa5192fd40af60b48d5968ccfb6ecd627 | |
| parent | 25c29d2329129a6bf2d949dd1ee5e336aaf9dcb4 (diff) | |
| parent | 6fd76f882f08c6c617851f460eab87d67e9df86c (diff) | |
| download | trove-89eaad2d2b0ddaf0857e7fb0a3b6b09d89f89642.tar.gz | |
Merge "Don't specify admin_token in paste config" into stable/icehouse
| -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 |