From ce9aae6aae219b54343c5f01801dd63c996df1d5 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Fri, 28 Jul 2017 11:25:04 +0000 Subject: [PATCH] Only run configuration tasks of kolla-ansible This saves us running the install steps and applies to these commands: kayobe overcloud service deploy kayobe overcloud service reconfigure kayobe overcloud service destroy We do run installation during kayobe overcloud service upgrade. --- kayobe/cli/commands.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/kayobe/cli/commands.py b/kayobe/cli/commands.py index 3246e18da..69ccb0199 100644 --- a/kayobe/cli/commands.py +++ b/kayobe/cli/commands.py @@ -413,8 +413,10 @@ class OvercloudServiceDeploy(KollaAnsibleMixin, KayobeAnsibleMixin, VaultMixin, self.app.LOG.debug("Deploying overcloud services") # First prepare configuration. - playbooks = _build_playbook_list("kolla-ansible", "kolla-openstack", - "swift-setup") + playbooks = _build_playbook_list("kolla-ansible") + self.run_kayobe_playbooks(parsed_args, playbooks, tags="config") + + playbooks = _build_playbook_list("kolla-openstack", "swift-setup") self.run_kayobe_playbooks(parsed_args, playbooks) # Run kolla-ansible prechecks before deployment. @@ -446,8 +448,10 @@ class OvercloudServiceReconfigure(KollaAnsibleMixin, KayobeAnsibleMixin, self.app.LOG.debug("Reconfiguring overcloud services") # First prepare configuration. - playbooks = _build_playbook_list("kolla-ansible", "kolla-openstack", - "swift-setup") + playbooks = _build_playbook_list("kolla-ansible") + self.run_kayobe_playbooks(parsed_args, playbooks, tags="config") + + playbooks = _build_playbook_list("kolla-openstack", "swift-setup") self.run_kayobe_playbooks(parsed_args, playbooks) # Run kolla-ansible prechecks before reconfiguration. @@ -517,7 +521,10 @@ class OvercloudServiceDestroy(KollaAnsibleMixin, KayobeAnsibleMixin, self.app.LOG.debug("Destroying overcloud services") # First prepare configuration. - playbooks = _build_playbook_list("kolla-ansible", "kolla-openstack") + playbooks = _build_playbook_list("kolla-ansible") + self.run_kayobe_playbooks(parsed_args, playbooks, tags="config") + + playbooks = _build_playbook_list("kolla-openstack") self.run_kayobe_playbooks(parsed_args, playbooks) # Run kolla-ansible destroy.