From 23a753a1105da64443c9b5c0e4b2017c4b7f55bd Mon Sep 17 00:00:00 2001 From: Fred Park Date: Thu, 27 Jul 2017 08:12:34 -0700 Subject: [PATCH] RemoteFS fixes --- convoy/fleet.py | 17 ++++++++++------- convoy/remotefs.py | 4 ++-- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/convoy/fleet.py b/convoy/fleet.py index 3d19114..e46aa3e 100644 --- a/convoy/fleet.py +++ b/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']: - logger.warning( - 'DEPRECATION WARNING: pool_specification:publisher/offer/sku ' - 'is set instead of a vm_configuration complex property. This ' - 'configuration will not be supported in future releases. ' - 'Please update your configuration to include a vm_configuration ' - 'property.') + try: + if 'publisher' in config['pool_specification']: + logger.warning( + 'DEPRECATION WARNING: pool_specification:publisher/offer/sku ' + 'is set instead of a vm_configuration complex property. This ' + 'configuration will not be supported in future releases. ' + 'Please update your configuration to include a ' + 'vm_configuration property.') + except KeyError: + pass def populate_global_settings(config, fs_storage, pool_id=None): diff --git a/convoy/remotefs.py b/convoy/remotefs.py index 2b3c538..1937c98 100644 --- a/convoy/remotefs.py +++ b/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),