From 3970b875d4fe35906598d3557c041911fc16f3ad Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Fri, 17 Nov 2017 11:37:44 +0000 Subject: [PATCH] Move galaxy requirements.yml to top level This prevents ansible from expecting it to be a playbook when running syntax checks against globbed file names. --- kayobe/cli/commands.py | 4 ++-- kayobe/tests/unit/cli/test_commands.py | 4 ++-- ansible/requirements.yml => requirements.yml | 0 3 files changed, 4 insertions(+), 4 deletions(-) rename ansible/requirements.yml => requirements.yml (100%) diff --git a/kayobe/cli/commands.py b/kayobe/cli/commands.py index 9a8da9928..577e5270d 100644 --- a/kayobe/cli/commands.py +++ b/kayobe/cli/commands.py @@ -120,7 +120,7 @@ class ControlHostBootstrap(KayobeAnsibleMixin, VaultMixin, Command): def take_action(self, parsed_args): self.app.LOG.debug("Bootstrapping Kayobe control host") - utils.galaxy_install("ansible/requirements.yml", "ansible/roles") + utils.galaxy_install("requirements.yml", "ansible/roles") playbooks = _build_playbook_list("bootstrap") self.run_kayobe_playbooks(parsed_args, playbooks) playbooks = _build_playbook_list("kolla-ansible") @@ -138,7 +138,7 @@ class ControlHostUpgrade(KayobeAnsibleMixin, VaultMixin, Command): def take_action(self, parsed_args): self.app.LOG.debug("Upgrading Kayobe control host") # Use force to upgrade roles. - utils.galaxy_install("ansible/requirements.yml", "ansible/roles", + utils.galaxy_install("requirements.yml", "ansible/roles", force=True) playbooks = _build_playbook_list("bootstrap") self.run_kayobe_playbooks(parsed_args, playbooks) diff --git a/kayobe/tests/unit/cli/test_commands.py b/kayobe/tests/unit/cli/test_commands.py index 4c3d06891..66160bbe6 100644 --- a/kayobe/tests/unit/cli/test_commands.py +++ b/kayobe/tests/unit/cli/test_commands.py @@ -42,7 +42,7 @@ class TestCase(unittest.TestCase): parsed_args = parser.parse_args([]) result = command.run(parsed_args) self.assertEqual(0, result) - mock_install.assert_called_once_with("ansible/requirements.yml", + mock_install.assert_called_once_with("requirements.yml", "ansible/roles") expected_calls = [ mock.call(mock.ANY, ["ansible/bootstrap.yml"]), @@ -60,7 +60,7 @@ class TestCase(unittest.TestCase): parsed_args = parser.parse_args([]) result = command.run(parsed_args) self.assertEqual(0, result) - mock_install.assert_called_once_with("ansible/requirements.yml", + mock_install.assert_called_once_with("requirements.yml", "ansible/roles", force=True) expected_calls = [ mock.call(mock.ANY, ["ansible/bootstrap.yml"]), diff --git a/ansible/requirements.yml b/requirements.yml similarity index 100% rename from ansible/requirements.yml rename to requirements.yml