airship
/
deckhand
Code Issues Proposed changes

Resolves liberal building of keystone auth parameters 

that end up pulling in default configuration options
from the keystone_authtoken sectiont hat are not supported
by v3.Password

This change strictly leverages the load_auth_from_conf_options
to only pass through options that are supported from the
configuration file

Change-Id: I2e90ed0f28cdd1d9553c852f5b3b774d82048375
This commit is contained in:
Alan Meadows 2018-02-06 17:12:51 -08:00 committed by Mark Burnett
parent 09dba6a672
commit feeed2f715
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deckhand/barbican/client_wrapper.py
View File

@ -12,8 +12,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from keystoneauth1.identity import v3
from keystoneauth1 import loading
from keystoneauth1 import session
from oslo_log import log as logging
from deckhand.conf import config
@ -48,8 +49,7 @@ class BarbicanClientWrapper(object):
# endpoint URL automatically.
barbican_url = CONF.barbican.api_endpoint
keystone_auth = dict(CONF.keystone_authtoken)
auth = v3.Password(**keystone_auth)
auth = loading.load_auth_from_conf_options(CONF, 'keystone_authtoken')
sess = session.Session(auth=auth)
try: