Merge remote-tracking branch 'origin/master' into edge

Author: jonasbardino

mig/shared/cloud.py

@@ -1025,9 +1025,9 @@ def _get_encoder(configuration, coding):
 
 
 def _get_jump_host(configuration, client_id, cloud_id, manage=False):
-    """Return any configured ssh jump host ssh details including address, port
-    and username for client_id on cloud_id. If the optional manage arg is set
-    the two additional manage key script and coding settings are added.
+    """Return any configured ssh jump host ssh details including address, port,
+    username and key for client_id on cloud_id. If the optional manage arg is
+    set the two additional manage key script and coding settings are added.
     """
     _logger = configuration.logger
     jump_host = {}
@@ -1041,6 +1041,8 @@ def _get_jump_host(configuration, client_id, cloud_id, manage=False):
     jump_host['fqdn'] = cloud_fqdn_from_ip(configuration, addr)[0]
     jump_host['user'] = lookup_user_service_value(
         configuration, client_id, service, 'service_jumphost_user', '')
+    jump_host['key'] = lookup_user_service_value(
+        configuration, client_id, service, 'service_jumphost_key', '')
     # TODO: support jumphost port with port map override?
     if manage:
         for name in ('manage_keys_script', 'manage_keys_coding'):
@@ -1094,6 +1096,8 @@ def _manage_jump_host_keys(configuration, client_id, cloud_id, action,
     ssh_cmd = ['ssh']
     if jump_host['user']:
         ssh_cmd.append('-oUser=%(user)s' % jump_host)
+    if jump_host['key']:
+        ssh_cmd.append('-oIdentityFile=%(key)s' % jump_host)
     ssh_cmd.append("%(fqdn)s" % jump_host)
     # NOTE: remote script should restrict key access to reduce abuse risk with
     # command="/bin/false",no-pty,no-agent-forwarding,no-X11-forwarding PUBKEY

mig/shared/configuration.py

@@ -1593,7 +1593,8 @@ def reload_config(self, verbose, skip_log=False, disable_auth_log=False):
                              'service_floating_network_id',
                              'service_availability_zone',
                              'service_jumphost_address',
-                             'service_jumphost_user']
+                             'service_jumphost_user',
+                             'service_jumphost_key']
         # Load generated cloud sections
         for section in config.sections():
             if 'CLOUD_' in section: