Code Review
/
snaps.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Modified code to support both Python 2.7 and 3.x
[snaps.git]
/
snaps
/
provisioning
/
ansible_utils.py
diff --git
a/snaps/provisioning/ansible_utils.py
b/snaps/provisioning/ansible_utils.py
index
39ae1e6
..
3fbc88f
100644
(file)
--- a/
snaps/provisioning/ansible_utils.py
+++ b/
snaps/provisioning/ansible_utils.py
@@
-1,4
+1,4
@@
-# Copyright (c) 201
6
Cable Television Laboratories, Inc. ("CableLabs")
+# Copyright (c) 201
7
Cable Television Laboratories, Inc. ("CableLabs")
# and others. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# 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:
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.warn
ing('Unable to connect via SSH with message - ' + str(e)
)