Merge "Start passing cloud_config object to shade"

This commit is contained in:
Jenkins 2015-06-26 14:18:42 +00:00 committed by Gerrit Code Review
commit e8d878f710
2 changed files with 2 additions and 1 deletions

View File

@ -288,6 +288,7 @@ class ProviderManager(TaskManager):
def _getClient(self):
return shade.OpenStackCloud(
self.provider.cloud_config.name,
cloud_config=self.provider.cloud_config,
**self.provider.cloud_config.config)
def runTask(self, task):

View File

@ -18,6 +18,6 @@ PrettyTable>=0.6,<0.8
# shade has a looser requirement on six than nodepool, so install six first
six>=1.7.0
os-client-config>=1.2.0
shade
shade>=0.7.0
diskimage-builder
voluptuous