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.
This commit is contained in:
parent
619ad3ebc8
commit
3970b875d4
@ -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)
|
||||
|
@ -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"]),
|
||||
|
Loading…
Reference in New Issue
Block a user