From 143b0ec2f6fc8103808fad2df99b7b1f6377eb39 Mon Sep 17 00:00:00 2001 From: Hirofumi Ichihara Date: Wed, 20 Nov 2013 15:17:02 +0800 Subject: [PATCH] metaplugin: use correct parameter to call neutron client Use region_name instead of auth_region. Change-Id: Ia4640f282de6d781f4f2d5b35da93afa4a88b6bb Closes-Bug: 1252982 --- neutron/agent/linux/interface.py | 2 +- neutron/plugins/metaplugin/proxy_neutron_plugin.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/neutron/agent/linux/interface.py b/neutron/agent/linux/interface.py index 42a1f82d15..768a2a3700 100644 --- a/neutron/agent/linux/interface.py +++ b/neutron/agent/linux/interface.py @@ -336,7 +336,7 @@ class MetaInterfaceDriver(LinuxInterfaceDriver): tenant_name=self.conf.admin_tenant_name, auth_url=self.conf.auth_url, auth_strategy=self.conf.auth_strategy, - auth_region=self.conf.auth_region + region_name=self.conf.auth_region ) self.flavor_driver_map = {} for flavor, driver_name in [ diff --git a/neutron/plugins/metaplugin/proxy_neutron_plugin.py b/neutron/plugins/metaplugin/proxy_neutron_plugin.py index 1590f5ae5a..e8faa310d1 100644 --- a/neutron/plugins/metaplugin/proxy_neutron_plugin.py +++ b/neutron/plugins/metaplugin/proxy_neutron_plugin.py @@ -42,7 +42,7 @@ class ProxyPluginV2(db_base_plugin_v2.NeutronDbPluginV2, tenant_name=cfg.CONF.PROXY.admin_tenant_name, auth_url=cfg.CONF.PROXY.auth_url, auth_strategy=cfg.CONF.PROXY.auth_strategy, - auth_region=cfg.CONF.PROXY.auth_region + region_name=cfg.CONF.PROXY.auth_region ) def _get_client(self):