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.
This commit is contained in:
Mark Goddard 2017-07-28 11:25:04 +00:00
parent ccea06bbe5
commit ce9aae6aae
1 changed files with 12 additions and 5 deletions

View File

@ -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.