x/tobiko
Code Issues Proposed changes

Rename parameter from vars_files to playbook_files

Browse Source 
Change-Id: Ibdb8909493bf825cb631b5f29fce06de980a88ce
This commit is contained in:
Federico Ressi
2022-03-29 09:30:46 +02:00
parent 287ba278e2
commit 2bc8192293
3 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tobiko/shell/ansible/_playbook.py
View File

@@ -85,13 +85,13 @@ class AnsiblePlaybook(tobiko.SharedFixture):
dirname = self.playbook_dirname dirname = self.playbook_dirname
return os.path.join(dirname, basename) return os.path.join(dirname, basename)
def _ensure_vars_files(self, def _ensure_playbook_files_files(self,
vars_files: typing.Iterable[str], playbook_files: typing.Iterable[str],
sub_dir: str = None, sub_dir: str = None,
dirname: str = None) -> typing.List[str]: dirname: str = None) -> typing.List[str]:
work_filenames = [] work_filenames = []
for vars_file in vars_files: for playbook_file in playbook_files:
filename = self._get_playbook_filename(basename=vars_file, filename = self._get_playbook_filename(basename=playbook_file,
dirname=dirname) dirname=dirname)
if sub_dir is None and dirname is not None: if sub_dir is None and dirname is not None:
sub_dir = os.path.relpath(os.path.dirname(filename), dirname) sub_dir = os.path.relpath(os.path.dirname(filename), dirname)
@@ -130,7 +130,7 @@ class AnsiblePlaybook(tobiko.SharedFixture):
playbook_dirname: str = None, playbook_dirname: str = None,
playbook_filename: str = None, playbook_filename: str = None,
inventory_filename: str = None, inventory_filename: str = None,
vars_files: typing.Iterable[str] = None) -> \ playbook_files: typing.Iterable[str] = None) -> \
sh.ShellCommand: sh.ShellCommand:
# ensure command # ensure command
if command is None: if command is None:
@@ -150,9 +150,10 @@ class AnsiblePlaybook(tobiko.SharedFixture):
playbook_dirname = os.path.dirname(playbook_filename) playbook_dirname = os.path.dirname(playbook_filename)
command += [self._ensure_work_file(playbook_filename)] command += [self._ensure_work_file(playbook_filename)]
if vars_files is not None: if playbook_files is not None:
self._ensure_vars_files(vars_files=vars_files, self._ensure_playbook_files_files(
dirname=playbook_dirname) playbook_files=playbook_files,
dirname=playbook_dirname)
return command return command
def run_playbook(self, def run_playbook(self,
@@ -161,14 +162,14 @@ class AnsiblePlaybook(tobiko.SharedFixture):
playbook_dirname: str = None, playbook_dirname: str = None,
playbook_filename: str = None, playbook_filename: str = None,
inventory_filename: str = None, inventory_filename: str = None,
vars_files: typing.Iterable[str] = None): playbook_files: typing.Iterable[str] = None):
tobiko.setup_fixture(self) tobiko.setup_fixture(self)
command = self._get_command(command=command, command = self._get_command(command=command,
playbook=playbook, playbook=playbook,
playbook_dirname=playbook_dirname, playbook_dirname=playbook_dirname,
playbook_filename=playbook_filename, playbook_filename=playbook_filename,
inventory_filename=inventory_filename, inventory_filename=inventory_filename,
vars_files=vars_files) playbook_files=playbook_files)
return self.sh_connection.execute(command, current_dir=self.work_dir) return self.sh_connection.execute(command, current_dir=self.work_dir)

2
tobiko/tests/sanity/shiftstack/test_shiftstack.py
View File

@@ -36,4 +36,4 @@ class OpenShiftTest(testtools.TestCase):
tripleo.run_playbook_from_undercloud( tripleo.run_playbook_from_undercloud(
playbook='debug-vars.yaml', playbook='debug-vars.yaml',
playbook_dirname=PLAYBOOK_DIRNAME, playbook_dirname=PLAYBOOK_DIRNAME,
vars_files=['vars/some-vars.yaml']) playbook_files=['vars/some-vars.yaml'])

4
tobiko/tripleo/_ansible.py
View File

@@ -106,14 +106,14 @@ def run_playbook_from_undercloud(command: sh.ShellCommand = None,
playbook_dirname: str = None, playbook_dirname: str = None,
playbook_filename: str = None, playbook_filename: str = None,
inventory_filename: str = None, inventory_filename: str = None,
vars_files: typing.Iterable[str] = None): playbook_files: typing.Iterable[str] = None):
return undercloud_ansible_playbook().run_playbook( return undercloud_ansible_playbook().run_playbook(
command=command, command=command,
playbook=playbook, playbook=playbook,
playbook_dirname=playbook_dirname, playbook_dirname=playbook_dirname,
playbook_filename=playbook_filename, playbook_filename=playbook_filename,
inventory_filename=inventory_filename, inventory_filename=inventory_filename,
vars_files=vars_files) playbook_files=playbook_files)
def setup_undercloud_ansible_plabook(): def setup_undercloud_ansible_plabook():