openstack/kayobe
Code Issues Proposed changes

Merge pull request #102 from markgoddard/host-upgrade-commands

Browse Source 
Fix host upgrade commands, create kolla-ansible virtualenv in host configure
This commit is contained in:
Mark Goddard 2017-12-21 09:34:38 +00:00 committed by GitHub
commit 208cced7c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 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)
# 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")

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

@ -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",
],

2
setup.py
View File

@ -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',