Browse code
Change config of keystone_authtoken in lib/ironic
This commit is temporary work-around until Ironic is fixed(bug#1422632)
The reason of creating temporary work-around is following
Ironic re-uses specific values from the keystone_authtoken middleware.
So we should specify admin_user, admin_password and so on instead of username, password.
Change-Id: If8869e16a167eea0af87afda0eabcbb803627db6
Closes-Bug: #1418341 at devstack
Yuki Nishiwaki authored on 2015/02/17 19:00:23Showing 1 changed files
| ... | ... |
@@ -278,7 +278,18 @@ function configure_ironic {
|
| 278 | 278 |
function configure_ironic_api {
|
| 279 | 279 |
iniset $IRONIC_CONF_FILE DEFAULT auth_strategy keystone |
| 280 | 280 |
iniset $IRONIC_CONF_FILE DEFAULT policy_file $IRONIC_POLICY_JSON |
| 281 |
- configure_auth_token_middleware $IRONIC_CONF_FILE ironic $IRONIC_AUTH_CACHE_DIR/api |
|
| 281 |
+ |
|
| 282 |
+ # TODO(Yuki Nishiwaki): This is a temporary work-around until Ironic is fixed(bug#1422632). |
|
| 283 |
+ # These codes need to be changed to use the function of configure_auth_token_middleware |
|
| 284 |
+ # after Ironic conforms to the new auth plugin. |
|
| 285 |
+ iniset $IRONIC_CONF_FILE keystone_authtoken identity_uri $KEYSTONE_AUTH_URI |
|
| 286 |
+ iniset $IRONIC_CONF_FILE keystone_authtoken auth_uri $KEYSTONE_SERVICE_URI/v2.0 |
|
| 287 |
+ iniset $IRONIC_CONF_FILE keystone_authtoken admin_user ironic |
|
| 288 |
+ iniset $IRONIC_CONF_FILE keystone_authtoken admin_password $SERVICE_PASSWORD |
|
| 289 |
+ iniset $IRONIC_CONF_FILE keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME |
|
| 290 |
+ iniset $IRONIC_CONF_FILE keystone_authtoken cafile $SSL_BUNDLE_FILE |
|
| 291 |
+ iniset $IRONIC_CONF_FILE keystone_authtoken signing_dir $IRONIC_AUTH_CACHE_DIR/api |
|
| 292 |
+ |
|
| 282 | 293 |
iniset_rpc_backend ironic $IRONIC_CONF_FILE DEFAULT |
| 283 | 294 |
iniset $IRONIC_CONF_FILE api port $IRONIC_SERVICE_PORT |
| 284 | 295 |
|