|
1 This patch has been integrated into Glance 11.0.0 in Liberty but has |
|
2 not yet been back-ported to Kilo. |
|
3 |
|
4 commit b7fb5bf0f89f657ead98024ee0168f2c2fa7a776 |
|
5 Author: Erno Kuvaja <[email protected]> |
|
6 Date: Mon Sep 28 10:44:38 2015 +0000 |
|
7 |
|
8 Return missing authtoken options |
|
9 |
|
10 Example configs were missing keystone_authtoken section after moving |
|
11 to generated config files. This change returns that to generation. |
|
12 |
|
13 Closes-Bug: #1500361 |
|
14 |
|
15 Change-Id: I6ee82c38061d483cea7254d155d9a72436880e84 |
|
16 (cherry picked from commit b1d2d938d282ccd51986e57a638f8ea5bec56b0f) |
|
17 |
|
18 diff --git a/etc/oslo-config-generator/glance-api.conf b/etc/oslo-config-generator/glance-api.conf |
|
19 index d60dc12..3f24718 100644 |
|
20 --- a/etc/oslo-config-generator/glance-api.conf |
|
21 +++ b/etc/oslo-config-generator/glance-api.conf |
|
22 @@ -7,5 +7,5 @@ namespace = oslo.messaging |
|
23 namespace = oslo.db |
|
24 namespace = oslo.db.concurrency |
|
25 namespace = oslo.policy |
|
26 -namespace = keystoneclient.middleware.auth_token |
|
27 +namespace = keystonemiddleware.auth_token |
|
28 namespace = oslo.log |
|
29 diff --git a/etc/oslo-config-generator/glance-registry.conf b/etc/oslo-config-generator/glance-registry.conf |
|
30 index 0663fc1..961abd9 100644 |
|
31 --- a/etc/oslo-config-generator/glance-registry.conf |
|
32 +++ b/etc/oslo-config-generator/glance-registry.conf |
|
33 @@ -6,5 +6,5 @@ namespace = oslo.messaging |
|
34 namespace = oslo.db |
|
35 namespace = oslo.db.concurrency |
|
36 namespace = oslo.policy |
|
37 -namespace = keystoneclient.middleware.auth_token |
|
38 +namespace = keystonemiddleware.auth_token |
|
39 namespace = oslo.log |