From 5676298adadc6b6734846fa71ae1dad9ca3575c7 Mon Sep 17 00:00:00 2001 From: ricolin Date: Wed, 15 Jun 2016 01:10:07 +0800 Subject: [PATCH] Remove deprecated auth_plugin config Config auth_plugin in trustee group is deprecated. Change to use auth_type in trustee group instead. Closes-Bug: 1592482 Change-Id: I57d2fbbc426b0ce0478f7b8dfac7533c7d513bf0 --- devstack/lib/heat | 2 +- install-guide/source/install-obs.rst | 2 +- install-guide/source/install-rdo.rst | 2 +- install-guide/source/install-ubuntu.rst | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devstack/lib/heat b/devstack/lib/heat index f422afe456..59b7cf2b59 100644 --- a/devstack/lib/heat +++ b/devstack/lib/heat @@ -155,7 +155,7 @@ function configure_heat { # If HEAT_DEFERRED_AUTH is unset or explicitly set to trusts, configure # the section for the client plugin associated with the trustee if [ -z "$HEAT_DEFERRED_AUTH" -o "trusts" == "$HEAT_DEFERRED_AUTH" ]; then - iniset $HEAT_CONF trustee auth_plugin password + iniset $HEAT_CONF trustee auth_type password iniset $HEAT_CONF trustee auth_url $KEYSTONE_AUTH_URI iniset $HEAT_CONF trustee username $HEAT_TRUSTEE_USER iniset $HEAT_CONF trustee password $HEAT_TRUSTEE_PASSWORD diff --git a/install-guide/source/install-obs.rst b/install-guide/source/install-obs.rst index c43316ff14..89457f1b61 100644 --- a/install-guide/source/install-obs.rst +++ b/install-guide/source/install-obs.rst @@ -374,7 +374,7 @@ Install and configure components [trustee] ... - auth_plugin = password + auth_type = password auth_url = http://controller:35357 username = heat password = HEAT_PASS diff --git a/install-guide/source/install-rdo.rst b/install-guide/source/install-rdo.rst index 5d003ea371..3a6c05972f 100644 --- a/install-guide/source/install-rdo.rst +++ b/install-guide/source/install-rdo.rst @@ -374,7 +374,7 @@ Install and configure components [trustee] ... - auth_plugin = password + auth_type = password auth_url = http://controller:35357 username = heat password = HEAT_PASS diff --git a/install-guide/source/install-ubuntu.rst b/install-guide/source/install-ubuntu.rst index b049aeb1c5..940a3fa24c 100644 --- a/install-guide/source/install-ubuntu.rst +++ b/install-guide/source/install-ubuntu.rst @@ -373,7 +373,7 @@ Install and configure components [trustee] ... - auth_plugin = password + auth_type = password auth_url = http://controller:35357 username = heat password = HEAT_PASS