From 19fd66a17829f679fb95e85ad02c62e606d77fb0 Mon Sep 17 00:00:00 2001 From: Chris MacNaughton Date: Tue, 12 May 2020 14:22:16 +0200 Subject: [PATCH] Fix new lint errors --- zaza/openstack/charm_tests/manila_ganesha/tests.py | 3 +-- zaza/openstack/utilities/series_upgrade.py | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/zaza/openstack/charm_tests/manila_ganesha/tests.py b/zaza/openstack/charm_tests/manila_ganesha/tests.py index 44ed2cd..e24a9f3 100644 --- a/zaza/openstack/charm_tests/manila_ganesha/tests.py +++ b/zaza/openstack/charm_tests/manila_ganesha/tests.py @@ -125,6 +125,5 @@ packages: openstack_utils.ssh_command( username, fip_2, 'instance-2', - 'sudo cat /mnt/ceph/test'.format( - mount_path), + 'sudo cat /mnt/ceph/test', password=password, privkey=privkey, verify=verify) diff --git a/zaza/openstack/utilities/series_upgrade.py b/zaza/openstack/utilities/series_upgrade.py index bff8afc..f12f77b 100644 --- a/zaza/openstack/utilities/series_upgrade.py +++ b/zaza/openstack/utilities/series_upgrade.py @@ -190,7 +190,7 @@ def series_upgrade_non_leaders_first( completed_machines.append(machine) else: logging.info("Skipping unit: {}. Machine: {} already upgraded. " - .format(unit, machine, application)) + .format(unit, machine)) model.block_until_all_units_idle() # Series upgrade the leader @@ -206,7 +206,7 @@ def series_upgrade_non_leaders_first( completed_machines.append(machine) else: logging.info("Skipping unit: {}. Machine: {} already upgraded." - .format(unit, machine, application)) + .format(unit, machine)) model.block_until_all_units_idle() @@ -295,7 +295,7 @@ async def async_series_upgrade_non_leaders_first( completed_machines.append(machine) else: logging.info("Skipping unit: {}. Machine: {} already upgraded. " - .format(unit, machine, application)) + .format(unit, machine)) await model.async_block_until_all_units_idle() # Series upgrade the leader @@ -312,7 +312,7 @@ async def async_series_upgrade_non_leaders_first( completed_machines.append(machine) else: logging.info("Skipping unit: {}. Machine: {} already upgraded." - .format(unit, machine, application)) + .format(unit, machine)) await model.async_block_until_all_units_idle()