Browse code
Set Nova auth_proto regardless of tls-proxy.
We actually want to comment out the keystone auth_proto in Nova's
api-paste.ini file regardless of the tls-proxy setting. Likewise
lets always set it in nova.conf as well.
This should fix an issue in trying to get this in:
https://review.openstack.org/#/c/52825/
Change-Id: I1b8202aa1666cbb6ca13d2f77d50fa0175969266
Dan Prince authored on 2013/10/31 04:11:08Showing 1 changed files
| ... | ... |
@@ -221,9 +221,7 @@ function configure_nova() {
|
| 221 | 221 |
# Comment out the keystone configs in Nova's api-paste.ini. |
| 222 | 222 |
# We are using nova.conf to configure this instead. |
| 223 | 223 |
inicomment $NOVA_API_PASTE_INI filter:authtoken auth_host |
| 224 |
- if is_service_enabled tls-proxy; then |
|
| 225 |
- inicomment $NOVA_API_PASTE_INI filter:authtoken auth_protocol |
|
| 226 |
- fi |
|
| 224 |
+ inicomment $NOVA_API_PASTE_INI filter:authtoken auth_protocol |
|
| 227 | 225 |
inicomment $NOVA_API_PASTE_INI filter:authtoken admin_tenant_name |
| 228 | 226 |
inicomment $NOVA_API_PASTE_INI filter:authtoken admin_user |
| 229 | 227 |
inicomment $NOVA_API_PASTE_INI filter:authtoken admin_password |
| ... | ... |
@@ -397,9 +395,7 @@ function create_nova_conf() {
|
| 397 | 397 |
# Add keystone authtoken configuration |
| 398 | 398 |
|
| 399 | 399 |
iniset $NOVA_CONF keystone_authtoken auth_host $KEYSTONE_AUTH_HOST |
| 400 |
- if is_service_enabled tls-proxy; then |
|
| 401 |
- iniset $NOVA_CONF keystone_authtoken auth_protocol $KEYSTONE_AUTH_PROTOCOL |
|
| 402 |
- fi |
|
| 400 |
+ iniset $NOVA_CONF keystone_authtoken auth_protocol $KEYSTONE_AUTH_PROTOCOL |
|
| 403 | 401 |
iniset $NOVA_CONF keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME |
| 404 | 402 |
iniset $NOVA_CONF keystone_authtoken admin_user nova |
| 405 | 403 |
iniset $NOVA_CONF keystone_authtoken admin_password $SERVICE_PASSWORD |