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

Ensure the secondary-first function takes the same arguments

Browse Source
This commit is contained in:
Chris MacNaughton
2020-05-12 14:12:35 +02:00
parent 185b7907d7
commit 695fbd85da
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -112,9 +112,11 @@ def series_upgrade_non_leaders_first(
to_series="xenial",
origin='openstack-origin',
completed_machines=[],
post_upgrade_functions=None,
pause_non_leader_primary=False,
pause_non_leader_subordinate=False
pause_non_leader_subordinate=False,
files=None,
workaround_script=None,
post_upgrade_functions=None
):
"""Series upgrade non leaders first.
@@ -141,6 +143,10 @@ def series_upgrade_non_leaders_first(
paused
:type pause_non_leader_subordinate: bool
:param from_series: The series from which to upgrade
:param files: Workaround files to scp to unit under upgrade
:type files: list
:param workaround_script: Workaround script to run during series upgrade
:type workaround_script: str
:returns: None
:rtype: None
"""
@@ -194,6 +200,8 @@ def series_upgrade_non_leaders_first(
series_upgrade(leader, machine,
from_series=from_series, to_series=to_series,
origin=origin,
workaround_script=workaround_script,
files=files,
post_upgrade_functions=post_upgrade_functions)
completed_machines.append(machine)
else:
@@ -208,9 +216,11 @@ async def async_series_upgrade_non_leaders_first(
to_series="xenial",
origin='openstack-origin',
completed_machines=[],
post_upgrade_functions=None,
pause_non_leader_primary=False,
pause_non_leader_subordinate=False
pause_non_leader_subordinate=False,
files=None,
workaround_script=None,
post_upgrade_functions=None
):
"""Series upgrade non leaders first.
@@ -237,6 +247,10 @@ async def async_series_upgrade_non_leaders_first(
paused
:type pause_non_leader_subordinate: bool
:param from_series: The series from which to upgrade
:param files: Workaround files to scp to unit under upgrade
:type files: list
:param workaround_script: Workaround script to run during series upgrade
:type workaround_script: str
:returns: None
:rtype: None
"""
@@ -292,6 +306,8 @@ async def async_series_upgrade_non_leaders_first(
leader, machine,
from_series=from_series, to_series=to_series,
origin=origin,
workaround_script=workaround_script,
files=files,
post_upgrade_functions=post_upgrade_functions)
completed_machines.append(machine)
else: