diff --git a/ansible/kolla-host.yml b/ansible/kolla-host.yml deleted file mode 100644 index daea555d7..000000000 --- a/ansible/kolla-host.yml +++ /dev/null @@ -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 diff --git a/kayobe/cli/commands.py b/kayobe/cli/commands.py index afc95bb43..3fdd46d4e 100644 --- a/kayobe/cli/commands.py +++ b/kayobe/cli/commands.py @@ -618,8 +618,7 @@ class SeedHostConfigure(KollaAnsibleMixin, KayobeAnsibleMixin, VaultMixin, self.run_kolla_ansible_seed(parsed_args, "bootstrap-servers") # Run final kayobe playbooks. - playbooks = _build_playbook_list( - "kolla-host", "docker") + playbooks = _build_playbook_list("docker") self.run_kayobe_playbooks(parsed_args, playbooks, limit="seed") # Optionally, deploy a Docker Registry. @@ -1178,8 +1177,7 @@ class OvercloudHostConfigure(KollaAnsibleMixin, KayobeAnsibleMixin, VaultMixin, self.run_kolla_ansible_overcloud(parsed_args, "bootstrap-servers") # Further kayobe playbooks. - playbooks = _build_playbook_list( - "kolla-host", "docker", "swift-block-devices") + playbooks = _build_playbook_list("docker", "swift-block-devices") self.run_kayobe_playbooks(parsed_args, playbooks, limit="overcloud") diff --git a/kayobe/tests/unit/cli/test_commands.py b/kayobe/tests/unit/cli/test_commands.py index b49d0ade4..03451c85e 100644 --- a/kayobe/tests/unit/cli/test_commands.py +++ b/kayobe/tests/unit/cli/test_commands.py @@ -535,7 +535,6 @@ class TestCase(unittest.TestCase): mock.call( mock.ANY, [ - utils.get_data_files_path("ansible", "kolla-host.yml"), utils.get_data_files_path("ansible", "docker.yml"), ], limit="seed", @@ -1308,7 +1307,6 @@ class TestCase(unittest.TestCase): mock.call( 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", "swift-block-devices.yml"),