openstack/kayobe
Code Issues Proposed changes

Create and install kolla-ansible virtual environment in host configure

Browse Source 
This ensures that even if the version of kolla-ansible in use does not have support
for remote virtualenvs (patch still in review), the default configuration of using
remote virtualenvs for kolla-ansible still works.
This commit is contained in:
Mark Goddard 2017-12-20 17:58:49 +00:00
parent 62074a841d
commit f3dbda1821
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kayobe/cli/commands.py
View File

@ -412,7 +412,8 @@ class SeedHostConfigure(KollaAnsibleMixin, KayobeAnsibleMixin, VaultMixin,
extra_vars=extra_vars) extra_vars=extra_vars)
# Run final kayobe playbooks. # Run final kayobe playbooks.
playbooks = _build_playbook_list("kolla-host", "docker") playbooks = _build_playbook_list(
"kolla-target-venv", "kolla-host", "docker")
self.run_kayobe_playbooks(parsed_args, playbooks, limit="seed") self.run_kayobe_playbooks(parsed_args, playbooks, limit="seed")
@ -700,7 +701,8 @@ class OvercloudHostConfigure(KollaAnsibleMixin, KayobeAnsibleMixin, VaultMixin,
extra_vars=extra_vars) extra_vars=extra_vars)
# Further kayobe playbooks. # Further kayobe playbooks.
playbooks = _build_playbook_list("kolla-host", "docker") playbooks = _build_playbook_list(
"kolla-target-venv", "kolla-host", "docker")
self.run_kayobe_playbooks(parsed_args, playbooks, limit="overcloud") self.run_kayobe_playbooks(parsed_args, playbooks, limit="overcloud")

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

@ -186,6 +186,7 @@ class TestCase(unittest.TestCase):
mock.call( mock.call(
mock.ANY, mock.ANY,
[ [
"ansible/kolla-target-venv.yml",
"ansible/kolla-host.yml", "ansible/kolla-host.yml",
"ansible/docker.yml", "ansible/docker.yml",
], ],
@ -427,6 +428,7 @@ class TestCase(unittest.TestCase):
mock.call( mock.call(
mock.ANY, mock.ANY,
[ [
"ansible/kolla-target-venv.yml",
"ansible/kolla-host.yml", "ansible/kolla-host.yml",
"ansible/docker.yml", "ansible/docker.yml",
], ],