Repository: libcloud Updated Branches: refs/heads/trunk a37a02a80 -> 1a8361482
flake and doc fixes Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/87c95010 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/87c95010 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/87c95010 Branch: refs/heads/trunk Commit: 87c950102cee8b7738aad80082058c76af767533 Parents: 4f8a3e6 Author: Mario Loria <ma...@arroyonetworks.com> Authored: Fri Oct 7 21:52:08 2016 -0400 Committer: Anthony Shaw <anthonys...@apache.org> Committed: Sat Oct 8 13:29:22 2016 +1100 ---------------------------------------------------------------------- docs/container/drivers/rancher.rst | 7 ------- libcloud/test/container/test_rancher.py | 6 +++--- 2 files changed, 3 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/87c95010/docs/container/drivers/rancher.rst ---------------------------------------------------------------------- diff --git a/docs/container/drivers/rancher.rst b/docs/container/drivers/rancher.rst index 63cc8ea..c118397 100644 --- a/docs/container/drivers/rancher.rst +++ b/docs/container/drivers/rancher.rst @@ -21,13 +21,6 @@ Here are some notes around this driver: - ``launchConfig`` options for ``ex_deploy_service`` can all be defined at the top level then get slipstreamed appropriately. - Passing your own cert/key of any sort for SSL/TLS is not presently supported. -- For SSL/TLS (https) support with newer versions of OpenSSL, the following - is necessary (in your own code): - - .. code:: - import ssl - import libcloud.security - libcloud.security.SSL_VERSION = ssl.PROTOCOL_TLSv1_2 To enable API access, obtain an Environment API Key from your Rancher Server for the specific environment you want to control. http://git-wip-us.apache.org/repos/asf/libcloud/blob/87c95010/libcloud/test/container/test_rancher.py ---------------------------------------------------------------------- diff --git a/libcloud/test/container/test_rancher.py b/libcloud/test/container/test_rancher.py index 743c2d3..f9ddc83 100644 --- a/libcloud/test/container/test_rancher.py +++ b/libcloud/test/container/test_rancher.py @@ -218,9 +218,9 @@ class RancherMockHttp(MockHttp): def _v1_containers(self, method, url, body, headers): if '?state=running' in url: - return (httplib.OK, self.fixtures.load( - 'ex_search_containers.json'), {}, httplib.responses[httplib.OK] - ) + return (httplib.OK, + self.fixtures.load('ex_search_containers.json'), {}, + httplib.responses[httplib.OK]) elif method == 'POST': return (httplib.OK, self.fixtures.load('deploy_container.json'), {}, httplib.responses[httplib.OK])
