x/omni
Code Issues Proposed changes

Merge pull request #4 from platform9/private/sarun87/fix-neutron-creds-for-boto3

Browse Source 
Fix neutron credentials for boto3 connection
This commit is contained in:
Arun Sriraman 2016-11-02 14:30:37 -07:00 committed by GitHub
commit 5b6816f479
1 changed files with 3 additions and 6 deletions

9
neutron/neutron/common/aws_utils.py

@ -69,14 +69,11 @@ class AwsUtils:
self.__ec2_resource = None self.__ec2_resource = None
self._nova_client = None self._nova_client = None
self._neutron_credentials = { self._neutron_credentials = {
'secret_key': cfg.CONF.AWS.secret_key, 'aws_secret_access_key': cfg.CONF.AWS.secret_key,
'access_key': cfg.CONF.AWS.access_key, 'aws_access_key_id': cfg.CONF.AWS.access_key,
'region_name': cfg.CONF.AWS.region_name, 'region_name': cfg.CONF.AWS.region_name
'az': cfg.CONF.AWS.az,
'wait_time_min': cfg.CONF.AWS.wait_time_min
} }
def get_nova_client(self): def get_nova_client(self):
if self._nova_client is None: if self._nova_client is None:
self._nova_client = novaclient.Client(username=cfg.CONF.nova_admin_username, self._nova_client = novaclient.Client(username=cfg.CONF.nova_admin_username,