Drop kolla-host.yml playbook

This playbook is no longer necessary following the removal of the iSCSI
deploy driver from Ironic.

Change-Id: I9e99c04173acb7adb0d0e367b6db388b86baf5f2
This commit is contained in:
Mark Goddard 2022-01-18 17:03:25 +00:00
parent 2f1aed03d2
commit b273af0e89
3 changed files with 2 additions and 30 deletions

View File

@ -1,24 +0,0 @@
---
- name: Ensure Kolla host services are configured
hosts: controllers
tags:
- kolla-ansible
- kolla-host
tasks:
- name: Ensure host iSCSI services are stopped and disabled
service:
name: "{{ item }}"
state: stopped
enabled: no
become: True
with_items:
- iscsid.socket
- iscsiuio.socket
- iscsid.service
register: result
failed_when:
- result is failed
# If a service is not installed, the ansible service module will fail
# with this error message.
- '"Could not find the requested service" not in result.msg'
when: kolla_enable_ironic | bool

View File

@ -618,8 +618,7 @@ class SeedHostConfigure(KollaAnsibleMixin, KayobeAnsibleMixin, VaultMixin,
self.run_kolla_ansible_seed(parsed_args, "bootstrap-servers") self.run_kolla_ansible_seed(parsed_args, "bootstrap-servers")
# Run final kayobe playbooks. # Run final kayobe playbooks.
playbooks = _build_playbook_list( playbooks = _build_playbook_list("docker")
"kolla-host", "docker")
self.run_kayobe_playbooks(parsed_args, playbooks, limit="seed") self.run_kayobe_playbooks(parsed_args, playbooks, limit="seed")
# Optionally, deploy a Docker Registry. # Optionally, deploy a Docker Registry.
@ -1178,8 +1177,7 @@ class OvercloudHostConfigure(KollaAnsibleMixin, KayobeAnsibleMixin, VaultMixin,
self.run_kolla_ansible_overcloud(parsed_args, "bootstrap-servers") self.run_kolla_ansible_overcloud(parsed_args, "bootstrap-servers")
# Further kayobe playbooks. # Further kayobe playbooks.
playbooks = _build_playbook_list( playbooks = _build_playbook_list("docker", "swift-block-devices")
"kolla-host", "docker", "swift-block-devices")
self.run_kayobe_playbooks(parsed_args, playbooks, limit="overcloud") self.run_kayobe_playbooks(parsed_args, playbooks, limit="overcloud")

View File

@ -535,7 +535,6 @@ class TestCase(unittest.TestCase):
mock.call( mock.call(
mock.ANY, mock.ANY,
[ [
utils.get_data_files_path("ansible", "kolla-host.yml"),
utils.get_data_files_path("ansible", "docker.yml"), utils.get_data_files_path("ansible", "docker.yml"),
], ],
limit="seed", limit="seed",
@ -1308,7 +1307,6 @@ class TestCase(unittest.TestCase):
mock.call( mock.call(
mock.ANY, mock.ANY,
[ [
utils.get_data_files_path("ansible", "kolla-host.yml"),
utils.get_data_files_path("ansible", "docker.yml"), utils.get_data_files_path("ansible", "docker.yml"),
utils.get_data_files_path( utils.get_data_files_path(
"ansible", "swift-block-devices.yml"), "ansible", "swift-block-devices.yml"),