Merge "Revert "Fix os_privileged_user_auth_url""
This commit is contained in:
commit
00969f0bf2
|
@ -113,7 +113,7 @@ function configure_masakari {
|
|||
|
||||
# Set os_privileged_user credentials (used for connecting nova service)
|
||||
iniset $MASAKARI_CONF DEFAULT os_privileged_user_name nova
|
||||
iniset $MASAKARI_CONF DEFAULT os_privileged_user_auth_url "${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_AUTH_HOST}/identity"
|
||||
iniset $MASAKARI_CONF DEFAULT os_privileged_user_auth_url "${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_AUTH_HOST}/identity_admin"
|
||||
iniset $MASAKARI_CONF DEFAULT os_privileged_user_password "$SERVICE_PASSWORD"
|
||||
iniset $MASAKARI_CONF DEFAULT os_privileged_user_tenant "$SERVICE_PROJECT_NAME"
|
||||
iniset $MASAKARI_CONF DEFAULT graceful_shutdown_timeout "$SERVICE_GRACEFUL_SHUTDOWN_TIMEOUT"
|
||||
|
|
Loading…
Reference in New Issue