openstack/mistral
Code Issues Proposed changes

Merge "Stop using deprecated keystone_authtoken/auth_uri"

Browse Source
This commit is contained in:
Zuul 2019-02-19 21:09:01 +00:00 committed by Gerrit Code Review
commit af9a605689
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/plugin.sh
View File

@ -78,7 +78,7 @@ function configure_mistral {
# Setup keystone_authtoken section # Setup keystone_authtoken section
configure_auth_token_middleware $MISTRAL_CONF_FILE mistral $MISTRAL_AUTH_CACHE_DIR configure_auth_token_middleware $MISTRAL_CONF_FILE mistral $MISTRAL_AUTH_CACHE_DIR
iniset $MISTRAL_CONF_FILE keystone_authtoken auth_uri $KEYSTONE_AUTH_URI_V3 iniset $MISTRAL_CONF_FILE keystone_authtoken www_authenticate_uri $KEYSTONE_AUTH_URI_V3
# Setup RabbitMQ credentials # Setup RabbitMQ credentials
iniset_rpc_backend mistral $MISTRAL_CONF_FILE iniset_rpc_backend mistral $MISTRAL_CONF_FILE

2
doc/source/configuration/config-guide.rst
View File

@ -19,7 +19,7 @@ directory.
auth properties:: auth properties::
[keystone_authtoken] [keystone_authtoken]
auth_uri = http://<keystone-host>:5000/v3 www_authenticate_uri = http://keystone1.example.com:5000/v3
identity_uri = http://<keystone-host:5000 identity_uri = http://<keystone-host:5000
auth_version = v3 auth_version = v3
admin_user = <user> admin_user = <user>

2
doc/source/install/mistralclient_guide.rst
View File

@ -93,7 +93,7 @@ workflow on the `http://keystone2.example.com` cloud.
The mistral.conf will look like:: The mistral.conf will look like::
[keystone_authtoken] [keystone_authtoken]
auth_uri = http://keystone1.example.com:5000/v3 www_authenticate_uri = http://keystone1.example.com:5000/v3
... ...
The client side parameters will be:: The client side parameters will be::

2
lower-constraints.txt
View File

@ -43,7 +43,7 @@ jsonpointer==1.13
jsonschema==2.6.0 jsonschema==2.6.0
kazoo==2.2 kazoo==2.2
keystoneauth1==3.4.0 keystoneauth1==3.4.0
keystonemiddleware==4.17.0 keystonemiddleware==4.18.0
kombu==4.0.0 kombu==4.0.0
linecache2==1.0.0 linecache2==1.0.0
logutils==0.3.5 logutils==0.3.5

2
mistral/context.py
View File

@ -167,7 +167,7 @@ def _extract_mistral_auth_params(headers):
) )
else: else:
params = { params = {
'auth_uri': CONF.keystone_authtoken.auth_uri, 'auth_uri': CONF.keystone_authtoken.www_authenticate_uri,
'auth_cacert': CONF.keystone_authtoken.cafile, 'auth_cacert': CONF.keystone_authtoken.cafile,
'insecure': False, 'insecure': False,
'region_name': headers.get('X-Region-Name'), 'region_name': headers.get('X-Region-Name'),

8
mistral/utils/openstack/keystone.py
View File

@ -32,7 +32,7 @@ CONF = cfg.CONF
def client(): def client():
ctx = context.ctx() ctx = context.ctx()
auth_url = ctx.auth_uri or CONF.keystone_authtoken.auth_uri auth_url = ctx.auth_uri or CONF.keystone_authtoken.www_authenticate_uri
cl = ks_client.Client( cl = ks_client.Client(
user_id=ctx.user_id, user_id=ctx.user_id,
@ -76,7 +76,7 @@ def get_session_and_auth(context, **kwargs):
auth = Token(endpoint=endpoint, token=context.auth_token) auth = Token(endpoint=endpoint, token=context.auth_token)
auth_uri = context.auth_uri or CONF.keystone_authtoken.auth_uri auth_uri = context.auth_uri or CONF.keystone_authtoken.www_authenticate_uri
ks_auth = Token( ks_auth = Token(
endpoint=auth_uri, endpoint=auth_uri,
token=context.auth_token token=context.auth_token
@ -94,7 +94,7 @@ def get_session_and_auth(context, **kwargs):
def _admin_client(trust_id=None): def _admin_client(trust_id=None):
if CONF.keystone_authtoken.auth_type is None: if CONF.keystone_authtoken.auth_type is None:
auth_url = CONF.keystone_authtoken.auth_uri auth_url = CONF.keystone_authtoken.www_authenticate_uri
project_name = CONF.keystone_authtoken.admin_tenant_name project_name = CONF.keystone_authtoken.admin_tenant_name
# You can't use trust and project together # You can't use trust and project together
@ -271,7 +271,7 @@ def get_admin_session():
"""Returns a keystone session from Mistral's service credentials.""" """Returns a keystone session from Mistral's service credentials."""
if CONF.keystone_authtoken.auth_type is None: if CONF.keystone_authtoken.auth_type is None:
auth = auth_plugins.Password( auth = auth_plugins.Password(
CONF.keystone_authtoken.auth_uri, CONF.keystone_authtoken.www_authenticate_uri,
username=CONF.keystone_authtoken.admin_user, username=CONF.keystone_authtoken.admin_user,
password=CONF.keystone_authtoken.admin_password, password=CONF.keystone_authtoken.admin_password,
project_name=CONF.keystone_authtoken.admin_tenant_name, project_name=CONF.keystone_authtoken.admin_tenant_name,

2
requirements.txt
View File

@ -12,7 +12,7 @@ eventlet!=0.20.1,>=0.20.0 # MIT
gnocchiclient>=3.3.1 # Apache-2.0 gnocchiclient>=3.3.1 # Apache-2.0
Jinja2>=2.10 # BSD License (3 clause) Jinja2>=2.10 # BSD License (3 clause)
jsonschema<3.0.0,>=2.6.0 # MIT jsonschema<3.0.0,>=2.6.0 # MIT
keystonemiddleware>=4.17.0 # Apache-2.0 keystonemiddleware>=4.18.0 # Apache-2.0
mistral-lib>=0.4.0 # Apache-2.0 mistral-lib>=0.4.0 # Apache-2.0
networkx>=1.10 # BSD networkx>=1.10 # BSD
oslo.concurrency>=3.26.0 # Apache-2.0 oslo.concurrency>=3.26.0 # Apache-2.0

2
test-requirements.txt
View File

@ -7,7 +7,7 @@ coverage!=4.4,>=4.0 # Apache-2.0
croniter>=0.3.4 # MIT License croniter>=0.3.4 # MIT License
doc8>=0.6.0 # Apache-2.0 doc8>=0.6.0 # Apache-2.0
fixtures>=3.0.0 # Apache-2.0/BSD fixtures>=3.0.0 # Apache-2.0/BSD
keystonemiddleware>=4.17.0 # Apache-2.0 keystonemiddleware>=4.18.0 # Apache-2.0
mistral-lib>=0.4.0 # Apache-2.0 mistral-lib>=0.4.0 # Apache-2.0
mock>=2.0.0 # BSD mock>=2.0.0 # BSD
networkx>=1.10 # BSD networkx>=1.10 # BSD