From 62074a841db6c8a7270fc2029499e5bc85588060 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 20 Dec 2017 17:57:02 +0000 Subject: [PATCH 1/2] Add missing kayobe command entry points to setup.py This allows Cliff to register commands for them. --- setup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py index 5cbcebc16..145c17402 100644 --- a/setup.py +++ b/setup.py @@ -82,7 +82,9 @@ setup( 'seed_container_image_build = kayobe.cli.commands:SeedContainerImageBuild', 'seed_deployment_image_build = kayobe.cli.commands:SeedDeploymentImageBuild', 'seed_host_configure = kayobe.cli.commands:SeedHostConfigure', + 'seed_host_upgrade = kayobe.cli.commands:SeedHostUpgrade', 'seed_hypervisor_host_configure = kayobe.cli.commands:SeedHypervisorHostConfigure', + 'seed_hypervisor_host_upgrade = kayobe.cli.commands:SeedHypervisorHostUpgrade', 'seed_service_deploy = kayobe.cli.commands:SeedServiceDeploy', 'seed_vm_deprovision = kayobe.cli.commands:SeedVMDeprovision', 'seed_vm_provision = kayobe.cli.commands:SeedVMProvision', From f3dbda1821838e003e814ce38235850f8bc71b2c Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 20 Dec 2017 17:58:49 +0000 Subject: [PATCH 2/2] Create and install kolla-ansible virtual environment in host configure 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. --- kayobe/cli/commands.py | 6 ++++-- kayobe/tests/unit/cli/test_commands.py | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/kayobe/cli/commands.py b/kayobe/cli/commands.py index f4596feab..61b43b4f8 100644 --- a/kayobe/cli/commands.py +++ b/kayobe/cli/commands.py @@ -412,7 +412,8 @@ class SeedHostConfigure(KollaAnsibleMixin, KayobeAnsibleMixin, VaultMixin, extra_vars=extra_vars) # 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") @@ -700,7 +701,8 @@ class OvercloudHostConfigure(KollaAnsibleMixin, KayobeAnsibleMixin, VaultMixin, extra_vars=extra_vars) # 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") diff --git a/kayobe/tests/unit/cli/test_commands.py b/kayobe/tests/unit/cli/test_commands.py index 70ef75334..237ce8284 100644 --- a/kayobe/tests/unit/cli/test_commands.py +++ b/kayobe/tests/unit/cli/test_commands.py @@ -186,6 +186,7 @@ class TestCase(unittest.TestCase): mock.call( mock.ANY, [ + "ansible/kolla-target-venv.yml", "ansible/kolla-host.yml", "ansible/docker.yml", ], @@ -427,6 +428,7 @@ class TestCase(unittest.TestCase): mock.call( mock.ANY, [ + "ansible/kolla-target-venv.yml", "ansible/kolla-host.yml", "ansible/docker.yml", ],