openstack
/
aodh
Code Issues Proposed changes

devstack: use password with version discovery 

Devstack will move to keystone v3, so support it here.

Change-Id: I169d6bcce23ef93b1bd12572721375b3c8c87707
Closes-bug: #1539728
This commit is contained in:
Mehdi Abaakouk 2016-02-01 08:52:25 +01:00
parent 5201b5eb73
commit 43f0002f50
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
devstack/plugin.sh
View File

@ -195,11 +195,14 @@ function configure_aodh {
cp $AODH_DIR/etc/aodh/api_paste.ini $AODH_CONF_DIR
# The alarm evaluator needs these options to call gnocchi/ceilometer APIs
iniset $AODH_CONF service_credentials os_username aodh
iniset $AODH_CONF service_credentials os_password $SERVICE_PASSWORD
iniset $AODH_CONF service_credentials os_tenant_name $SERVICE_TENANT_NAME
iniset $AODH_CONF service_credentials os_region_name $REGION_NAME
iniset $AODH_CONF service_credentials os_auth_url $KEYSTONE_SERVICE_URI/v2.0
iniset $AODH_CONF service_credentials auth_type password
iniset $AODH_CONF service_credentials username aodh
iniset $AODH_CONF service_credentials user_domain_name default
iniset $AODH_CONF service_credentials project_domain_name default
iniset $AODH_CONF service_credentials password $SERVICE_PASSWORD
iniset $AODH_CONF service_credentials project_name $SERVICE_TENANT_NAME
iniset $AODH_CONF service_credentials region_name $REGION_NAME
iniset $AODH_CONF service_credentials auth_url $KEYSTONE_SERVICE_URI
configure_auth_token_middleware $AODH_CONF aodh $AODH_AUTH_CACHE_DIR