openstack/kayobe
Code Issues Proposed changes

Move galaxy requirements.yml to top level

Browse Source 
This prevents ansible from expecting it to be a playbook when running syntax
checks against globbed file names.
This commit is contained in:
Mark Goddard 2017-11-17 11:37:44 +00:00
parent 619ad3ebc8
commit 3970b875d4
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kayobe/cli/commands.py
View File

@ -120,7 +120,7 @@ class ControlHostBootstrap(KayobeAnsibleMixin, VaultMixin, Command):
def take_action(self, parsed_args): def take_action(self, parsed_args):
self.app.LOG.debug("Bootstrapping Kayobe control host") 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") playbooks = _build_playbook_list("bootstrap")
self.run_kayobe_playbooks(parsed_args, playbooks) self.run_kayobe_playbooks(parsed_args, playbooks)
playbooks = _build_playbook_list("kolla-ansible") playbooks = _build_playbook_list("kolla-ansible")
@ -138,7 +138,7 @@ class ControlHostUpgrade(KayobeAnsibleMixin, VaultMixin, Command):
def take_action(self, parsed_args): def take_action(self, parsed_args):
self.app.LOG.debug("Upgrading Kayobe control host") self.app.LOG.debug("Upgrading Kayobe control host")
# Use force to upgrade roles. # Use force to upgrade roles.
utils.galaxy_install("ansible/requirements.yml", "ansible/roles", utils.galaxy_install("requirements.yml", "ansible/roles",
force=True) force=True)
playbooks = _build_playbook_list("bootstrap") playbooks = _build_playbook_list("bootstrap")
self.run_kayobe_playbooks(parsed_args, playbooks) self.run_kayobe_playbooks(parsed_args, playbooks)

4
kayobe/tests/unit/cli/test_commands.py
View File

@ -42,7 +42,7 @@ class TestCase(unittest.TestCase):
parsed_args = parser.parse_args([]) parsed_args = parser.parse_args([])
result = command.run(parsed_args) result = command.run(parsed_args)
self.assertEqual(0, result) self.assertEqual(0, result)
mock_install.assert_called_once_with("ansible/requirements.yml", mock_install.assert_called_once_with("requirements.yml",
"ansible/roles") "ansible/roles")
expected_calls = [ expected_calls = [
mock.call(mock.ANY, ["ansible/bootstrap.yml"]), mock.call(mock.ANY, ["ansible/bootstrap.yml"]),
@ -60,7 +60,7 @@ class TestCase(unittest.TestCase):
parsed_args = parser.parse_args([]) parsed_args = parser.parse_args([])
result = command.run(parsed_args) result = command.run(parsed_args)
self.assertEqual(0, result) 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) "ansible/roles", force=True)
expected_calls = [ expected_calls = [
mock.call(mock.ANY, ["ansible/bootstrap.yml"]), mock.call(mock.ANY, ["ansible/bootstrap.yml"]),

0
ansible/requirements.yml → requirements.yml
View File