Merge "Support identity API v3 when generate clouds.yaml"

This commit is contained in:
Jenkins 2015-07-06 16:01:49 +00:00 committed by Gerrit Code Review
commit 05e32fb51e

View File

@ -43,6 +43,9 @@ class UpdateCloudsYaml(object):
'project_name': args.os_project_name, 'project_name': args.os_project_name,
}, },
} }
if args.os_identity_api_version == '3':
self._cloud_data['auth']['user_domain_id'] = 'default'
self._cloud_data['auth']['project_domain_id'] = 'default'
if args.os_cacert: if args.os_cacert:
self._cloud_data['cacert'] = args.os_cacert self._cloud_data['cacert'] = args.os_cacert