fixup kwargs config handling
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/5cd5f9d7 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/5cd5f9d7 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/5cd5f9d7 Branch: refs/heads/trunk Commit: 5cd5f9d73203e97cad83ef5076d13df71cc0485f Parents: ce9073d Author: Mario Loria <ma...@arroyonetworks.com> Authored: Wed Oct 5 18:51:35 2016 -0400 Committer: Anthony Shaw <anthonys...@apache.org> Committed: Sat Oct 8 13:29:22 2016 +1100 ---------------------------------------------------------------------- libcloud/container/drivers/rancher.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/5cd5f9d7/libcloud/container/drivers/rancher.py ---------------------------------------------------------------------- diff --git a/libcloud/container/drivers/rancher.py b/libcloud/container/drivers/rancher.py index ae4d7c1..2a6b8d5 100644 --- a/libcloud/container/drivers/rancher.py +++ b/libcloud/container/drivers/rancher.py @@ -312,7 +312,7 @@ class RancherContainerDriver(ContainerDriver): metadata=None, retain_ip=None, scale=None, scale_policy=None, secondary_launch_configs=None, selector_container=None, selector_link=None, - vip=None, **kwargs): + vip=None, **launch_conf): """ Deploy a Rancher Service under a stack. @@ -369,17 +369,14 @@ class RancherContainerDriver(ContainerDriver): :rtype: ``dict`` """ - launchconfig = { - "imageUuid": self._degen_image(image), - **kwargs - } + launch_conf['imageUuid'] = self._degen_image(image), service_payload = { "assignServiceIpAddress": assign_service_ip_address, "description": service_description, "environmentId": environment_id, "externalId": external_id, - "launchConfig": launchconfig, + "launchConfig": launch_conf, "metadata": metadata, "name": name, "retainIp": retain_ip, @@ -497,7 +494,7 @@ class RancherContainerDriver(ContainerDriver): return containers def deploy_container(self, name, image, parameters=None, start=True, - **kwargs): + **config): """ Deploy a new container. @@ -537,10 +534,10 @@ class RancherContainerDriver(ContainerDriver): "name": name, "imageUuid": self._degen_image(image), "startOnCreate": start, - **kwargs } + config.update(payload) - data = json.dumps(payload) + data = json.dumps(config) result = self.connection.request('%s/containers' % self.baseuri, data=data, method='POST').object
