diff options
author | 2018-09-25 00:18:36 +0200 | |
---|---|---|
committer | 2018-09-26 02:26:34 +0200 | |
commit | f28386431c4ecbc9c7bee24b60eb9f4371ca3c63 (patch) | |
tree | 5eb6dbd381bf4a4855ad19fc49c1df98b62c44df /modules/opnfv/utils/ssh_utils.py | |
parent | 133e35d5d89e48e46d3e5818a9e70dac84827334 (diff) |
modules.opnfv: fuel adapter: Switch to MCP
The current codebase was intended for Fuel@OPNFV up to and including
the Danube release (based on Fuel@Openstack).
Starting with the Euphrates release, Fuel@OPNFV is based on Mirantis
Cloud Platform (MCP), so the Fuel adapter in modules.opnfv needs a
rework to accomodate the new platform:
- remove unused obsolete code in opnfv.utils;
- switch to key-based SSH auth instead of password-based;
- drop proxy-ing SSH to cluster nodes via installer node, instead
SSH directly via PXE/admin network;
Notes:
- MaaS node (when present) is marked with 'installer' role to prevent
ovs-vsctl queries on it;
- gtw01 node (when present) is not marked with any role yet;
JIRA: FUEL-394
Change-Id: If2b7744b950cd502df8eaca0137c9f845a9d077d
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'modules/opnfv/utils/ssh_utils.py')
-rw-r--r-- | modules/opnfv/utils/ssh_utils.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/opnfv/utils/ssh_utils.py b/modules/opnfv/utils/ssh_utils.py index 175a38078..22727170b 100644 --- a/modules/opnfv/utils/ssh_utils.py +++ b/modules/opnfv/utils/ssh_utils.py @@ -49,10 +49,11 @@ def get_ssh_client(hostname, client = paramiko.SSHClient() else: client = ProxyHopClient() + proxy_password = proxy.get('password', None) proxy_pkey_file = proxy.get('pkey_file', '/root/.ssh/id_rsa') client.configure_jump_host(proxy['ip'], proxy['username'], - proxy['password'], + proxy_password, proxy_pkey_file) if client is None: raise Exception('Could not connect to client') |