RemoteFS fixes

convoy/fleet.py

@@ -238,13 +238,16 @@ def check_for_invalid_config(config):
                 'for vm_count.')
     except KeyError:
         pass
-    if 'publisher' in config['pool_specification']:
+    try:
-        logger.warning(
+        if 'publisher' in config['pool_specification']:
-            'DEPRECATION WARNING: pool_specification:publisher/offer/sku '
+            logger.warning(
-            'is set instead of a vm_configuration complex property. This '
+                'DEPRECATION WARNING: pool_specification:publisher/offer/sku '
-            'configuration will not be supported in future releases. '
+                'is set instead of a vm_configuration complex property. This '
-            'Please update your configuration to include a vm_configuration '
+                'configuration will not be supported in future releases. '
-            'property.')
+                'Please update your configuration to include a '
+                'vm_configuration property.')
+    except KeyError:
+        pass
 
 
 def populate_global_settings(config, fs_storage, pool_id=None):

convoy/remotefs.py

@@ -1044,7 +1044,7 @@ def resize_storage_cluster(
     for i in pe_vms:
         vm = pe_vms[i]['vm']
         ssh_info = _get_ssh_info(
-            compute_client, network_client, config, None, vm.name)
+            compute_client, network_client, config, sc_id, None, vm.name)
         break
     if settings.verbose(config):
         logger.debug('prober vm: {}'.format(ssh_info))
@@ -1378,7 +1378,7 @@ def expand_storage_cluster(
                 s=' -s {}'.format(rfs.storage_cluster.file_server.type),
             )
         ssh_priv_key, port, username, ip = _get_ssh_info(
-            compute_client, network_client, config, None, vm.name)
+            compute_client, network_client, config, sc_id, None, vm.name)
         cmd = ['ssh', '-o', 'StrictHostKeyChecking=no',
                '-o', 'UserKnownHostsFile={}'.format(os.devnull),
                '-i', str(ssh_priv_key), '-p', str(port),