From d5323979ad247ae247f9b201934cba86f59aeba6 Mon Sep 17 00:00:00 2001 From: Yuki Nishiwaki Date: Tue, 17 Feb 2015 19:00:23 +0900 Subject: [PATCH] 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 --- lib/ironic | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/lib/ironic b/lib/ironic index 7ffa6a5caf..7313d2508e 100644 --- a/lib/ironic +++ b/lib/ironic @@ -278,7 +278,18 @@ function configure_ironic { function configure_ironic_api { iniset $IRONIC_CONF_FILE DEFAULT auth_strategy keystone iniset $IRONIC_CONF_FILE DEFAULT policy_file $IRONIC_POLICY_JSON - configure_auth_token_middleware $IRONIC_CONF_FILE ironic $IRONIC_AUTH_CACHE_DIR/api + + # TODO(Yuki Nishiwaki): This is a temporary work-around until Ironic is fixed(bug#1422632). + # These codes need to be changed to use the function of configure_auth_token_middleware + # after Ironic conforms to the new auth plugin. + iniset $IRONIC_CONF_FILE keystone_authtoken identity_uri $KEYSTONE_AUTH_URI + iniset $IRONIC_CONF_FILE keystone_authtoken auth_uri $KEYSTONE_SERVICE_URI/v2.0 + iniset $IRONIC_CONF_FILE keystone_authtoken admin_user ironic + iniset $IRONIC_CONF_FILE keystone_authtoken admin_password $SERVICE_PASSWORD + iniset $IRONIC_CONF_FILE keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME + iniset $IRONIC_CONF_FILE keystone_authtoken cafile $SSL_BUNDLE_FILE + iniset $IRONIC_CONF_FILE keystone_authtoken signing_dir $IRONIC_AUTH_CACHE_DIR/api + iniset_rpc_backend ironic $IRONIC_CONF_FILE DEFAULT iniset $IRONIC_CONF_FILE api port $IRONIC_SERVICE_PORT