diff options
| author | Ihar Hrachyshka <ihrachys@redhat.com> | 2014-01-30 13:42:29 +0100 |
|---|---|---|
| committer | Ihar Hrachyshka <ihrachys@redhat.com> | 2014-02-11 21:07:44 +0100 |
| commit | 15a912b1ca3c24ba8851b8b77d6de8027e120d78 (patch) | |
| tree | 458378868066538e8f25a9a8e8f977447fb62293 | |
| parent | 927e8a645a20f9d8d9971620c2f7aace3aa294e7 (diff) | |
| download | neutron-15a912b1ca3c24ba8851b8b77d6de8027e120d78.tar.gz | |
Fix passing keystone token to neutronclient instance2013.2.2
Neutron client expects token to be passed as token= argument, while
neutron-metadata-agent passes auth_token= instead. This effectively makes the
client to authenticate against keystone each time it's instantiated. In
neutron-metadata-agent case, it means 'each time a client sends a metadata
request.'
The issue results in high cpu utilization on keystone side when simultaneously
invoking multiple nova instances with cloud-init.
Change-Id: I2a31f9c0c3cfa915975ecc53d71168a3895528d8
Closes-Bug: 1274487
(cherry picked from commit 3799efe792700e7736666c40cc42c265eee09230)
| -rw-r--r-- | neutron/agent/metadata/agent.py | 2 | ||||
| -rw-r--r-- | neutron/tests/unit/test_metadata_agent.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/neutron/agent/metadata/agent.py b/neutron/agent/metadata/agent.py index e0042f45f7..95fba3b971 100644 --- a/neutron/agent/metadata/agent.py +++ b/neutron/agent/metadata/agent.py @@ -80,7 +80,7 @@ class MetadataProxyHandler(object): auth_url=self.conf.auth_url, auth_strategy=self.conf.auth_strategy, region_name=self.conf.auth_region, - auth_token=self.auth_info.get('auth_token'), + token=self.auth_info.get('auth_token'), endpoint_url=self.auth_info.get('endpoint_url'), endpoint_type=self.conf.endpoint_type ) diff --git a/neutron/tests/unit/test_metadata_agent.py b/neutron/tests/unit/test_metadata_agent.py index aa1cc84eea..578843299c 100644 --- a/neutron/tests/unit/test_metadata_agent.py +++ b/neutron/tests/unit/test_metadata_agent.py @@ -99,7 +99,7 @@ class TestMetadataProxyHandler(base.BaseTestCase): auth_url=FakeConf.auth_url, password=FakeConf.admin_password, auth_strategy=FakeConf.auth_strategy, - auth_token=None, + token=None, endpoint_url=None, endpoint_type=FakeConf.endpoint_type) ] |