- proxy_settings = ProxySettings(tokens[0], tokens[1], config.get('ssh_proxy_cmd'))
-
- os_creds = OSCreds(username=config['username'], password=config['password'],
- auth_url=config['os_auth_url'], project_name=config['project_name'],
- identity_api_version=identity_api_version, image_api_version=image_api_version,
- proxy_settings=proxy_settings)
-
- logger.info('OS Credentials = ' + str(os_creds))
+ proxy_settings = ProxySettings(
+ host=tokens[0], port=tokens[1],
+ ssh_proxy_cmd=config.get('ssh_proxy_cmd'))
+
+ creds_dict = {
+ 'username': config['username'],
+ 'password': config['password'],
+ 'auth_url': config['os_auth_url'],
+ 'project_name': config['project_name'],
+ 'identity_api_version': config.get('identity_api_version'),
+ 'image_api_version': config.get('image_api_version'),
+ 'network_api_version': config.get('network_api_version'),
+ 'compute_api_version': config.get('compute_api_version'),
+ 'heat_api_version': config.get('heat_api_version'),
+ 'user_domain_id': config.get('user_domain_id'),
+ 'user_domain_name': config.get('user_domain_name'),
+ 'project_domain_id': config.get('project_domain_id'),
+ 'project_domain_name': config.get('project_domain_name'),
+ 'volume_api_version': config.get('volume_api_version'),
+ 'interface': config.get('interface'),
+ 'proxy_settings': proxy_settings,
+ 'cacert': config.get('cacert'),
+ 'region_name': config.get('region_name')}
+
+ if overrides and isinstance(overrides, dict):
+ creds_dict.update(overrides)
+
+ os_creds = OSCreds(**creds_dict)
+ logger.info('OS Credentials = %s', os_creds.__str__)