Revert "Update devstack keystone_authtoken config to fit with keystone v3"

This reverts commit df8bf9c8f8.
That patch renamed keys of the configuration properties of the
keystone_authtoken settings group, thus breaking config file
compatibility.

Change-Id: I8fd3b3211e75207cf6061eef6f038ea045d9dbfe
This commit is contained in:
Alexander Tivelkov 2016-11-16 16:15:23 +00:00
parent a19a66707b
commit 3a18488cf4
3 changed files with 17 additions and 19 deletions

View File

@ -184,15 +184,14 @@ function configure_murano {
#-------------------------
# Setup keystone_authtoken section
iniset $MURANO_CONF_FILE keystone_authtoken auth_type password
iniset $MURANO_CONF_FILE keystone_authtoken auth_uri $KEYSTONE_SERVICE_URI
iniset $MURANO_CONF_FILE keystone_authtoken username $MURANO_ADMIN_USER
iniset $MURANO_CONF_FILE keystone_authtoken password $SERVICE_PASSWORD
iniset $MURANO_CONF_FILE keystone_authtoken user_domain_name "$SERVICE_DOMAIN_NAME"
iniset $MURANO_CONF_FILE keystone_authtoken project_name $SERVICE_PROJECT_NAME
iniset $MURANO_CONF_FILE keystone_authtoken project_domain_name "$SERVICE_DOMAIN_NAME"
iniset $MURANO_CONF_FILE keystone_authtoken cafile $SSL_BUNDLE_FILE
iniset $MURANO_CONF_FILE keystone_authtoken auth_url $KEYSTONE_AUTH_URI
iniset $MURANO_CONF_FILE keystone_authtoken auth_uri "http://${KEYSTONE_AUTH_HOST}:5000"
iniset $MURANO_CONF_FILE keystone_authtoken auth_host $KEYSTONE_AUTH_HOST
iniset $MURANO_CONF_FILE keystone_authtoken auth_port $KEYSTONE_AUTH_PORT
iniset $MURANO_CONF_FILE keystone_authtoken auth_protocol $KEYSTONE_AUTH_PROTOCOL
iniset $MURANO_CONF_FILE keystone_authtoken cafile $KEYSTONE_SSL_CA
iniset $MURANO_CONF_FILE keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME
iniset $MURANO_CONF_FILE keystone_authtoken admin_user $MURANO_ADMIN_USER
iniset $MURANO_CONF_FILE keystone_authtoken admin_password $SERVICE_PASSWORD
configure_murano_rpc_backend
@ -297,11 +296,11 @@ function configure_service_broker {
iniset $MURANO_CFAPI_CONF_FILE database connection `database_connection_url murano_cfapi`
# Setup keystone_authtoken section
iniset $MURANO_CFAPI_CONF_FILE keystone_authtoken cafile $KEYSTONE_SSL_CA
iniset $MURANO_CFAPI_CONF_FILE keystone_authtoken auth_uri "http://${KEYSTONE_AUTH_HOST}:5000"
iniset $MURANO_CFAPI_CONF_FILE keystone_authtoken auth_host $KEYSTONE_AUTH_HOST
iniset $MURANO_CFAPI_CONF_FILE keystone_authtoken auth_port $KEYSTONE_AUTH_PORT
iniset $MURANO_CFAPI_CONF_FILE keystone_authtoken auth_protocol $KEYSTONE_AUTH_PROTOCOL
iniset $MURANO_CFAPI_CONF_FILE keystone_authtoken cafile $KEYSTONE_SSL_CA
iniset $MURANO_CFAPI_CONF_FILE keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME
iniset $MURANO_CFAPI_CONF_FILE keystone_authtoken admin_user $MURANO_ADMIN_USER
iniset $MURANO_CFAPI_CONF_FILE keystone_authtoken admin_password $SERVICE_PASSWORD

View File

@ -168,9 +168,9 @@ class MuranoTestRunner(object):
def _validate_keystone_opts(self, args):
ks_opts_to_config = {
'auth_url': 'auth_uri',
'username': 'username',
'password': 'password',
'project_name': 'project_name'}
'username': 'admin_user',
'password': 'admin_password',
'project_name': 'admin_tenant_name'}
ks_opts = {'auth_url': getattr(args, 'os_auth_url', None),
'username': getattr(args, 'os_username', None),

View File

@ -34,15 +34,14 @@ def _get_keystone_auth(trust_id=None):
kwargs = {
'auth_url':
cfg.CONF[CFG_KEYSTONE_GROUP].auth_uri.replace('v2.0', 'v3'),
'username': cfg.CONF[CFG_KEYSTONE_GROUP].username,
'password': cfg.CONF[CFG_KEYSTONE_GROUP].password,
'user_domain_name': cfg.CONF[CFG_KEYSTONE_GROUP].user_domain_name
'username': cfg.CONF[CFG_KEYSTONE_GROUP].admin_user,
'password': cfg.CONF[CFG_KEYSTONE_GROUP].admin_password,
'user_domain_name': "Default"
}
if not trust_id:
kwargs['project_name'] = \
cfg.CONF[CFG_KEYSTONE_GROUP].project_name
kwargs['project_domain_name'] = \
cfg.CONF[CFG_KEYSTONE_GROUP].project_domain_name
cfg.CONF[CFG_KEYSTONE_GROUP].admin_tenant_name
kwargs['project_domain_name'] = "Default"
else:
kwargs['trust_id'] = trust_id
auth = identity.Password(**kwargs)