From c9da7d697591ec9343897badee9ce66a18a7fe9e Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Tue, 14 Jun 2022 15:29:12 +0200 Subject: [PATCH] Remove mention of haproxy-endpoints role Keystone role was never migrated to usage of haproxy-endpoints role and included task was used instead the whole time. With that to reduce complexity and to have unified approach, all mention of the role and handler are removed from the code. Change-Id: I2a83e31a9de998cd10dd95fc0cffc1ad68061da5 --- doc/source/index.rst | 13 ------------- handlers/main.yml | 4 ---- tasks/galera_install_apt.yml | 1 - tasks/galera_install_dnf.yml | 1 - tasks/galera_server_main.yml | 1 - tasks/galera_server_post_install.yml | 2 -- 6 files changed, 22 deletions(-) diff --git a/doc/source/index.rst b/doc/source/index.rst index 1ff1b750..8d4324a2 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -29,16 +29,3 @@ Example playbook .. literalinclude:: ../../examples/playbook.yml :language: yaml - -External Restart Hooks -~~~~~~~~~~~~~~~~~~~~~~ - -When the role performs a restart of the mariadb service, it will notify an -Ansible handler named ``Manage LB``, which is a noop within this role. In the -playbook, other roles may be loaded before and after this role which will -implement Ansible handler listeners for ``Manage LB``, that way external roles -can manage the load balancer endpoints responsible for sending traffic to the -MariaDB servers being restarted by marking them in maintenance or active mode, -draining sessions, etc. For an example implementation, please reference the -`ansible-haproxy-endpoints role `_ -used by the openstack-ansible project. diff --git a/handlers/main.yml b/handlers/main.yml index c35b9b17..c4541c96 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -89,10 +89,6 @@ notify: - Delete encryption keyfile after starting Galera -- meta: noop - listen: Manage LB - when: false - - name: Delete encryption keyfile after starting Galera file: path: "/tmp/.keyfile.key" diff --git a/tasks/galera_install_apt.yml b/tasks/galera_install_apt.yml index 28ca3d0d..445941c3 100644 --- a/tasks/galera_install_apt.yml +++ b/tasks/galera_install_apt.yml @@ -91,7 +91,6 @@ retries: 5 delay: 2 notify: - - Manage LB - Restart all mysql diff --git a/tasks/galera_install_dnf.yml b/tasks/galera_install_dnf.yml index 243b20e0..80c28d65 100644 --- a/tasks/galera_install_dnf.yml +++ b/tasks/galera_install_dnf.yml @@ -148,5 +148,4 @@ retries: 5 delay: 2 notify: - - Manage LB - Restart all mysql diff --git a/tasks/galera_server_main.yml b/tasks/galera_server_main.yml index 3e4e6d12..4aec775c 100644 --- a/tasks/galera_server_main.yml +++ b/tasks/galera_server_main.yml @@ -59,7 +59,6 @@ when: - (galera_ignore_cluster_state | bool) or (galera_force_bootstrap | bool) notify: - - Manage LB - Restart all mysql tags: - always diff --git a/tasks/galera_server_post_install.yml b/tasks/galera_server_post_install.yml index 3cdfc3c8..98aaa08a 100644 --- a/tasks/galera_server_post_install.yml +++ b/tasks/galera_server_post_install.yml @@ -160,7 +160,6 @@ mode: "0600" condition: "{{ (galera_root_user == 'root') }}" notify: - - Manage LB - Restart all mysql - name: Apply service defaults @@ -169,7 +168,6 @@ dest: "/etc/default/mariadb" mode: "0644" notify: - - Manage LB - Restart all mysql - name: Link mysql and mariadb config files