openstack/nova
Code Issues Proposed changes

Merge "Revert deprecation warning on Neutron auth."

Browse Source
This commit is contained in:
Jenkins 2014-03-24 18:08:20 +00:00 committed by Gerrit Code Review
commit d5c60434ab
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nova/network/neutronv2/__init__.py
View File

@ -17,7 +17,6 @@ from neutronclient.common import exceptions
from neutronclient.v2_0 import client as clientv20 from neutronclient.v2_0 import client as clientv20
from oslo.config import cfg from oslo.config import cfg
from nova.openstack.common.gettextutils import _
from nova.openstack.common import local from nova.openstack.common import local
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
@ -42,9 +41,6 @@ def _get_client(token=None):
params['tenant_id'] = CONF.neutron_admin_tenant_id params['tenant_id'] = CONF.neutron_admin_tenant_id
else: else:
params['tenant_name'] = CONF.neutron_admin_tenant_name params['tenant_name'] = CONF.neutron_admin_tenant_name
LOG.warning(_("Using neutron_admin_tenant_name for authentication "
"is deprecated and will be removed in the next "
"release. Use neutron_admin_tenant_id instead."))
params['password'] = CONF.neutron_admin_password params['password'] = CONF.neutron_admin_password
params['auth_url'] = CONF.neutron_admin_auth_url params['auth_url'] = CONF.neutron_admin_auth_url
params['auth_strategy'] = CONF.neutron_auth_strategy params['auth_strategy'] = CONF.neutron_auth_strategy

8
nova/network/neutronv2/api.py
View File

@ -51,10 +51,10 @@ neutron_opts = [
cfg.StrOpt('neutron_admin_tenant_id', cfg.StrOpt('neutron_admin_tenant_id',
help='Tenant id for connecting to neutron in admin context'), help='Tenant id for connecting to neutron in admin context'),
cfg.StrOpt('neutron_admin_tenant_name', cfg.StrOpt('neutron_admin_tenant_name',
help='DEPRECATED: Tenant name for connecting to neutron in ' help='Tenant name for connecting to neutron in admin context. '
'admin context. This option is deprecated. Please use ' 'This option is mutually exclusive with '
'neutron_admin_tenant_id instead. Note that with Keystone ' 'neutron_admin_tenant_id. Note that with Keystone V3 '
'V3 tenant names may not be unique.'), 'tenant names are only unique within a domain.'),
cfg.StrOpt('neutron_region_name', cfg.StrOpt('neutron_region_name',
help='Region name for connecting to neutron in admin context'), help='Region name for connecting to neutron in admin context'),
cfg.StrOpt('neutron_admin_auth_url', cfg.StrOpt('neutron_admin_auth_url',