openstack/zun
Code Issues Proposed changes

Remove the unused admin_* config

Browse Source 
It looks admin_* config are no longer used. This commit removes
it from zun's devstack plugin.

Change-Id: Iae9ac743f2199c793aa6dd77da62e1ec99de124b
This commit is contained in:
Hongbin Lu 2018-12-10 03:30:07 +00:00
parent 3ec5806222
commit 2c4afc8231
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devstack/lib/zun
View File

@ -207,15 +207,11 @@ function create_zun_conf {
iniset $ZUN_CONF keystone_auth project_domain_id default iniset $ZUN_CONF keystone_auth project_domain_id default
iniset $ZUN_CONF keystone_auth user_domain_id default iniset $ZUN_CONF keystone_auth user_domain_id default
# FIXME(pauloewerton): keystone_authtoken section is deprecated. Remove it
# after deprecation period.
iniset $ZUN_CONF keystone_authtoken admin_user zun
iniset $ZUN_CONF keystone_authtoken admin_password $SERVICE_PASSWORD
iniset $ZUN_CONF keystone_authtoken admin_tenant_name $SERVICE_PROJECT_NAME
configure_auth_token_middleware $ZUN_CONF zun $ZUN_AUTH_CACHE_DIR configure_auth_token_middleware $ZUN_CONF zun $ZUN_AUTH_CACHE_DIR
iniset $ZUN_CONF keystone_auth auth_url $KEYSTONE_AUTH_URI_V3 iniset $ZUN_CONF keystone_auth auth_url $KEYSTONE_AUTH_URI_V3
# FIXME(pauloewerton): keystone_authtoken section is deprecated. Remove it
# after deprecation period.
iniset $ZUN_CONF keystone_authtoken www_authenticate_uri $KEYSTONE_SERVICE_URI_V3 iniset $ZUN_CONF keystone_authtoken www_authenticate_uri $KEYSTONE_SERVICE_URI_V3
iniset $ZUN_CONF keystone_authtoken auth_url $KEYSTONE_AUTH_URI_V3 iniset $ZUN_CONF keystone_authtoken auth_url $KEYSTONE_AUTH_URI_V3
iniset $ZUN_CONF keystone_authtoken auth_version v3 iniset $ZUN_CONF keystone_authtoken auth_version v3