From 2c4afc823147a49477ed60687b65ffbbde0cb139 Mon Sep 17 00:00:00 2001 From: Hongbin Lu Date: Mon, 10 Dec 2018 03:30:07 +0000 Subject: [PATCH] Remove the unused admin_* config It looks admin_* config are no longer used. This commit removes it from zun's devstack plugin. Change-Id: Iae9ac743f2199c793aa6dd77da62e1ec99de124b --- devstack/lib/zun | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/devstack/lib/zun b/devstack/lib/zun index dcfa1f4bd..ccdf4fe1a 100644 --- a/devstack/lib/zun +++ b/devstack/lib/zun @@ -207,15 +207,11 @@ function create_zun_conf { iniset $ZUN_CONF keystone_auth project_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 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 auth_url $KEYSTONE_AUTH_URI_V3 iniset $ZUN_CONF keystone_authtoken auth_version v3