openstack/vitrage
Code Issues Proposed changes

Merge "Add nova_client's region option"

Browse Source
This commit is contained in:
Zuul 2020-04-03 10:10:28 +00:00 committed by Gerrit Code Review
commit 0d9be7cb4d
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
releasenotes/notes/deprecate-keystone_client-region-option-b3f30100370a5471.yaml Normal file
View File

@ -0,0 +1,7 @@
---
deprecations:
- The ``region-name`` is deprecated in keystone_client's cfgs, and
use ``region_name`` instead.
upgrade:
- The deprecated ``os-region-name`` option has been dropped.

4
vitrage/keystone_client.py
View File

@ -83,9 +83,9 @@ def delete_trust_id(trust_id, auth_plugin):
OPTS = [ OPTS = [
cfg.StrOpt('region-name', cfg.StrOpt('region_name',
default=os.environ.get('OS_REGION_NAME'), default=os.environ.get('OS_REGION_NAME'),
deprecated_name="os-region-name", deprecated_name="region-name",
help='Region name to use for OpenStack service endpoints.'), help='Region name to use for OpenStack service endpoints.'),
cfg.StrOpt('interface', cfg.StrOpt('interface',
default=os.environ.get( default=os.environ.get(

1
vitrage/os_clients.py
View File

@ -107,6 +107,7 @@ def nova_client():
n_client = driver_module('nova') n_client = driver_module('nova')
client = n_client.Client( client = n_client.Client(
version=CONF.nova_version, version=CONF.nova_version,
region_name=CONF.service_credentials.region_name,
session=keystone_client.get_session(), session=keystone_client.get_session(),
) )
LOG.info('Nova client created') LOG.info('Nova client created')