Start passing cloud_config object to shade

In preparation for shade taking all of its config directly from
cloud_config objects, pass the one we have in. This way we'll be passing
to both interfaces, so that shade can change which one it cares about.

Change-Id: I4e4c3824c8391597cb44bba61353d6f5dd947d54
This commit is contained in:
Monty Taylor 2015-06-09 10:31:48 -04:00
parent e8315afdfa
commit 150f266a11
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