From 73cca4441ce3a82959b001de48f860ab1e8afe5f Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 26 Jul 2017 17:48:36 +0000 Subject: [PATCH] Install kolla-ansible during kayobe control host bootstrap This ensures that it can be configured without installing it in later commands. --- kayobe/cli/commands.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kayobe/cli/commands.py b/kayobe/cli/commands.py index 8a74f7bfe..a470bc5a8 100644 --- a/kayobe/cli/commands.py +++ b/kayobe/cli/commands.py @@ -119,6 +119,8 @@ class ControlHostBootstrap(KayobeAnsibleMixin, VaultMixin, Command): utils.galaxy_install("ansible/requirements.yml", "ansible/roles") playbooks = _build_playbook_list("bootstrap") self.run_kayobe_playbooks(parsed_args, playbooks) + playbooks = _build_playbook_list("kolla-ansible") + self.run_kayobe_playbooks(parsed_args, playbooks, tags="install") class ControlHostUpgrade(KayobeAnsibleMixin, VaultMixin, Command): @@ -129,6 +131,8 @@ class ControlHostUpgrade(KayobeAnsibleMixin, VaultMixin, Command): utils.galaxy_install("ansible/requirements.yml", "ansible/roles") playbooks = _build_playbook_list("bootstrap") self.run_kayobe_playbooks(parsed_args, playbooks) + playbooks = _build_playbook_list("kolla-ansible") + self.run_kayobe_playbooks(parsed_args, playbooks, tags="install") class ConfigurationDump(KayobeAnsibleMixin, VaultMixin, Command):