x/vmware-nsx
Code Issues Proposed changes

Merge "Fix passing keystone token to neutronclient instance"

Browse Source
This commit is contained in:
Jenkins 2014-02-11 19:09:31 +00:00 committed by Gerrit Code Review
commit 12cb066103
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/agent/metadata/agent.py
View File

@ -87,7 +87,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
)

2
neutron/tests/unit/test_metadata_agent.py
View File

@ -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)
]