From 6a36d367b54538ef6347c948b3e549f21993771a Mon Sep 17 00:00:00 2001 From: Robert Collins Date: Tue, 11 Mar 2014 11:00:47 +1300 Subject: [PATCH] Revert deprecation warning on Neutron auth. This reverts the deprecation warning added in commit e80cf75fc0f25f6279200f59a70fd7c6e4766b0f. 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 --- nova/network/neutronv2/__init__.py | 4 ---- nova/network/neutronv2/api.py | 8 ++++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/nova/network/neutronv2/__init__.py b/nova/network/neutronv2/__init__.py index e1f5594476b5..d220f2470646 100644 --- a/nova/network/neutronv2/__init__.py +++ b/nova/network/neutronv2/__init__.py @@ -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 diff --git a/nova/network/neutronv2/api.py b/nova/network/neutronv2/api.py index 544628aa7c59..5b50763d8d24 100644 --- a/nova/network/neutronv2/api.py +++ b/nova/network/neutronv2/api.py @@ -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',