openstack/masakari
Code Issues Proposed changes

Fix auth_url setting for devstack

Browse Source 
Keystone is dropping some variables in devstack, switch to using the
same variable for the auth_url that keystone is using instead of
trying to reconstruct it ourselves.

Signed-off-by: Dr. Jens Harbott <harbott@osism.tech>
Change-Id: I3f167b3ce699669addc5ef07c174ffb142c2c8cc
This commit is contained in:
Dr. Jens Harbott 2021-10-20 07:25:39 +02:00
parent bb1c2ba6ee
commit 6a15818d62
No known key found for this signature in database
GPG Key ID: E7862B245C3596B1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/plugin.sh
View File

@ -147,7 +147,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_SERVICE_URI"
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"
@ -180,7 +180,7 @@ function configure_masakarimonitors {
--namespace oslo.middleware \
> $MASAKARI_MONITORS_CONF
iniset $MASAKARI_MONITORS_CONF api auth_url "${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_AUTH_HOST}/identity"
iniset $MASAKARI_MONITORS_CONF api auth_url "$KEYSTONE_SERVICE_URI"
iniset $MASAKARI_MONITORS_CONF api password "$SERVICE_PASSWORD"
iniset $MASAKARI_MONITORS_CONF api project_name "$SERVICE_PROJECT_NAME"
iniset $MASAKARI_MONITORS_CONF api username "$USERNAME"