arif/zaza-openstack-tests
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix new lint errors

Browse Source
This commit is contained in:
Chris MacNaughton
2020-05-12 14:22:16 +02:00
parent 695fbd85da
commit 19fd66a178
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
zaza/openstack/charm_tests/manila_ganesha/tests.py
View File

@@ -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)

8
zaza/openstack/utilities/series_upgrade.py
View File

@@ -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()