diff options
| author |   spisarski <s.pisarski@cablelabs.com> | 2017-05-04 12:43:53 -0600 |
|---|---|---|
| committer | spisarski <s.pisarski@cablelabs.com> | 2017-05-08 09:31:16 -0600 |
| commit | d1c4675e5c35257b84cd69969c6e67575faf19db (patch) | |
| tree | 63ff3b41ff445b8c192ec33c0aefb913a112b613 /snaps/provisioning/ansible_utils.py | |
| parent | 40c96233ca4c27de1b3d8b53187c302ddd6208a2 (diff) | |
Modified code to support both Python 2.7 and 3.x
* Tested on Python 2.7.10 and 3.4.4
* Updated installation documentation
JIRA: SNAPS-30
Change-Id: I94a37d218be8ea47bbbcfb560197737430fcb3ba
Signed-off-by: spisarski <s.pisarski@cablelabs.com>
Diffstat (limited to 'snaps/provisioning/ansible_utils.py')
| -rw-r--r-- | snaps/provisioning/ansible_utils.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/snaps/provisioning/ansible_utils.py b/snaps/provisioning/ansible_utils.py index 39ae1e6..3fbc88f 100644 --- a/snaps/provisioning/ansible_utils.py +++ b/snaps/provisioning/ansible_utils.py @@ -1,4 +1,4 @@ -# Copyright (c) 2016 Cable Television Laboratories, Inc. ("CableLabs") +# Copyright (c) 2017 Cable Television Laboratories, Inc. ("CableLabs") # and others. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -105,4 +105,4 @@ def ssh_client(ip, user, private_key_filepath, proxy_settings=None): ssh.connect(ip, username=user, key_filename=private_key_filepath, sock=proxy_cmd) return ssh except Exception as e: - logger.warn('Unable to connect via SSH with message - ' + e.message) + logger.warning('Unable to connect via SSH with message - ' + str(e)) |