From ba1ca0e499c6bba6af53c29c748bc850f2cf2e12 Mon Sep 17 00:00:00 2001 From: Erik Olof Gunnar Andersson Date: Fri, 26 Oct 2018 18:55:58 -0700 Subject: [PATCH] Removed admin_* from devstack config The admin_* variables are a relic of the Keystone V2 api and should no longer be used at all. It's important to keep the devstack config clean, as it is often used as a reference for configuring services. * Removed deprecated admin_user, admin_password and admin_tenant. Story: 2004272 Task: 27821 Change-Id: I132e670f446e5172dc4f1847be7779645060ca4d --- devstack/lib/magnum | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/devstack/lib/magnum b/devstack/lib/magnum index 1af8755d34..b92457ea5e 100644 --- a/devstack/lib/magnum +++ b/devstack/lib/magnum @@ -151,15 +151,12 @@ function create_magnum_conf { iniset $MAGNUM_CONF keystone_auth project_domain_id default iniset $MAGNUM_CONF keystone_auth user_domain_id default - # FIXME(pauloewerton): keystone_authtoken section is deprecated. Remove it - # after deprecation period. - iniset $MAGNUM_CONF keystone_authtoken admin_user magnum - iniset $MAGNUM_CONF keystone_authtoken admin_password $SERVICE_PASSWORD - iniset $MAGNUM_CONF keystone_authtoken admin_tenant_name $SERVICE_PROJECT_NAME - configure_auth_token_middleware $MAGNUM_CONF magnum $MAGNUM_AUTH_CACHE_DIR iniset $MAGNUM_CONF keystone_auth auth_url $KEYSTONE_AUTH_URI_V3 + + # FIXME(pauloewerton): keystone_authtoken section is deprecated. Remove it + # after deprecation period. iniset $MAGNUM_CONF keystone_authtoken www_authenticate_uri $KEYSTONE_SERVICE_URI_V3 iniset $MAGNUM_CONF keystone_authtoken auth_url $KEYSTONE_AUTH_URI_V3 iniset $MAGNUM_CONF keystone_authtoken auth_version v3