openstack/nova
Code Issues Proposed changes

Revert deprecation warning on Neutron auth.

Browse Source 
This reverts the deprecation warning added in commit
e80cf75fc0.

V3 supports domain + project uniqueness, which is much more usable
than ids - massively more so for deployers. The initial patch
deprecates name, when that isn't necessary or appropriate - using name
based auth is as valid as id based auth - we just need to namespace
it in V3.

For V3 operators should be able to create:

* A service domain
* A service/service project
* A service/neutron user

to replace the prior

* service tenant
* neutron user

structure without switching to ids.

Closes-Bug: #1290540
Change-Id: I51837b0dc1bc352c0bf315e383951486b3cac034
This commit is contained in:
Robert Collins 2014-03-11 11:00:47 +13:00 committed by Dan Smith
parent 620be9a67a
commit 6a36d367b5
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 oslo.config import cfg
from nova.openstack.common.gettextutils import _
from nova.openstack.common import local
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
else:
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['auth_url'] = CONF.neutron_admin_auth_url
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',
help='Tenant id for connecting to neutron in admin context'),
cfg.StrOpt('neutron_admin_tenant_name',
help='DEPRECATED: Tenant name for connecting to neutron in '
'admin context. This option is deprecated. Please use '
'neutron_admin_tenant_id instead. Note that with Keystone '
'V3 tenant names may not be unique.'),
help='Tenant name for connecting to neutron in admin context. '
'This option is mutually exclusive with '
'neutron_admin_tenant_id. Note that with Keystone V3 '
'tenant names are only unique within a domain.'),
cfg.StrOpt('neutron_region_name',
help='Region name for connecting to neutron in admin context'),
cfg.StrOpt('neutron_admin_auth_url',