openstack
/
mistral
Code Issues Proposed changes

fix mistral devstack scripts 

- change keystone configuration section [keystone] to [keystone_authtoken]
  due to Mistral configuration file changes

Change-Id: I285c4460f3774c1cd38be7b53f50ffb395a66123
This commit is contained in:
Sergey Kolekonov 2014-06-06 13:17:13 +04:00
parent 0f54a8517a
commit 73092e90f4
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
contrib/devstack/lib/mistral
View File

@ -110,12 +110,12 @@ function configure_mistral {
#-------------------------
# Setup keystone_authtoken section
iniset $MISTRAL_CONF_FILE keystone auth_host $KEYSTONE_AUTH_HOST
iniset $MISTRAL_CONF_FILE keystone auth_port $KEYSTONE_AUTH_PORT
iniset $MISTRAL_CONF_FILE keystone auth_protocol $KEYSTONE_AUTH_PROTOCOL
iniset $MISTRAL_CONF_FILE keystone admin_tenant_name $SERVICE_TENANT_NAME
iniset $MISTRAL_CONF_FILE keystone admin_user $MISTRAL_ADMIN_USER
iniset $MISTRAL_CONF_FILE keystone admin_password $SERVICE_PASSWORD
iniset $MISTRAL_CONF_FILE keystone_authtoken auth_host $KEYSTONE_AUTH_HOST
iniset $MISTRAL_CONF_FILE keystone_authtoken auth_port $KEYSTONE_AUTH_PORT
iniset $MISTRAL_CONF_FILE keystone_authtoken auth_protocol $KEYSTONE_AUTH_PROTOCOL
iniset $MISTRAL_CONF_FILE keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME
iniset $MISTRAL_CONF_FILE keystone_authtoken admin_user $MISTRAL_ADMIN_USER
iniset $MISTRAL_CONF_FILE keystone_authtoken admin_password $SERVICE_PASSWORD
# Setup RabbitMQ credentials
iniset $MISTRAL_CONF_FILE DEFAULT rabbit_password $RABBIT_PASSWORD
@ -124,7 +124,7 @@ function configure_mistral {
iniset $MISTRAL_CONF_FILE database connection `database_connection_url mistral`
# Configure keystone auth url
iniset $MISTRAL_CONF_FILE keystone auth_uri "http://${KEYSTONE_AUTH_HOST}:5000/v3"
iniset $MISTRAL_CONF_FILE keystone_authtoken auth_uri "http://${KEYSTONE_AUTH_HOST}:5000/v3"
}