|
1 From c99f2d947ccb3ad568679d25b6180bfc46906fc7 Mon Sep 17 00:00:00 2001 |
|
2 From: Jamie Lennox <[email protected]> |
|
3 Date: Fri, 18 Sep 2015 13:17:45 +1000 |
|
4 Subject: Ensure auth_plugin options are in generated CONF |
|
5 |
|
6 Add the common auth plugin options to the list of options used to |
|
7 generate sample config files. |
|
8 |
|
9 Closes-Bug: #1497082 |
|
10 Change-Id: I22d704ebee18b6e9208126812e41aee6cc8331ef |
|
11 --- |
|
12 |
|
13 --- keystonemiddleware-1.5.2/keystonemiddleware/opts.py.~1~ 2015-06-29 08:36:33.000000000 -0700 |
|
14 +++ keystonemiddleware-1.5.2/keystonemiddleware/opts.py 2016-01-18 22:36:05.430322306 -0800 |
|
15 @@ -18,6 +18,8 @@ __all__ = [ |
|
16 |
|
17 import copy |
|
18 |
|
19 +from keystoneclient import auth |
|
20 + |
|
21 import keystonemiddleware.auth_token |
|
22 from keystonemiddleware.auth_token import _auth |
|
23 from keystonemiddleware.auth_token import _base |
|
24 @@ -25,7 +27,8 @@ from keystonemiddleware.auth_token impor |
|
25 auth_token_opts = [ |
|
26 (_base.AUTHTOKEN_GROUP, |
|
27 keystonemiddleware.auth_token._OPTS + |
|
28 - _auth.AuthTokenPlugin.get_options()) |
|
29 + _auth.AuthTokenPlugin.get_options() + |
|
30 + auth.get_common_conf_options()) |
|
31 ] |
|
32 |
|
33 |
|
34 --- keystonemiddleware-1.5.2/keystonemiddleware/tests/test_opts.py.~1~ 2015-06-29 08:36:33.000000000 -0700 |
|
35 +++ keystonemiddleware-1.5.2/keystonemiddleware/tests/test_opts.py 2016-01-18 22:36:43.623641221 -0800 |
|
36 @@ -62,7 +62,9 @@ class OptsTestCase(utils.TestCase): |
|
37 'include_service_catalog', |
|
38 'enforce_token_bind', |
|
39 'check_revocations_for_cached', |
|
40 - 'hash_algorithms' |
|
41 + 'hash_algorithms', |
|
42 + 'auth_plugin', |
|
43 + 'auth_section', |
|
44 ] |
|
45 opt_names = [o.name for (g, l) in result for o in l] |
|
46 self.assertThat(opt_names, matchers.HasLength(len(expected_opt_names))) |