From f3b2abb8876b5152fbe379b061b43095eb8556e0 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Tue, 14 Jun 2022 19:46:27 +0200 Subject: [PATCH] Remove mention of haproxy-endpoints role 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: I0c055393ccb1c8d61affc2c1bb6d01f0c329afe9 --- doc/source/index.rst | 13 ------------- handlers/main.yml | 4 ---- tasks/cinder_install_source.yml | 1 - tasks/cinder_post_install.yml | 2 -- 4 files changed, 20 deletions(-) diff --git a/doc/source/index.rst b/doc/source/index.rst index 689e9387..86a8f825 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -51,19 +51,6 @@ Example playbook .. literalinclude:: ../../examples/playbook.yml :language: yaml -External Restart Hooks -~~~~~~~~~~~~~~~~~~~~~~ - -When the role performs a restart of the 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``, allowing external roles -to manage the load balancer endpoints responsible for sending traffic to the -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. - Tags ~~~~ diff --git a/handlers/main.yml b/handlers/main.yml index 2118c5f1..d95a11e6 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -49,7 +49,3 @@ enabled: yes state: restarted daemon_reload: "{{ (ansible_facts['service_mgr'] == 'systemd') | ternary('yes', omit) }}" - -- meta: noop - listen: Manage LB - when: false diff --git a/tasks/cinder_install_source.yml b/tasks/cinder_install_source.yml index 75775176..05682455 100644 --- a/tasks/cinder_install_source.yml +++ b/tasks/cinder_install_source.yml @@ -54,6 +54,5 @@ register: _copy_rootwraps changed_when: _copy_rootwraps.stdout | length > 0 notify: - - Manage LB - Restart cinder services - Restart uwsgi services diff --git a/tasks/cinder_post_install.yml b/tasks/cinder_post_install.yml index c2a84d9b..0ec73af6 100644 --- a/tasks/cinder_post_install.yml +++ b/tasks/cinder_post_install.yml @@ -32,7 +32,6 @@ config_overrides: "{{ cinder_cinder_conf_overrides }}" config_type: "ini" notify: - - Manage LB - Restart cinder services - Restart uwsgi services tags: @@ -56,7 +55,6 @@ config_overrides: "{{ cinder_resource_filters_overrides }}" config_type: "json" notify: - - Manage LB - Restart cinder services - Restart uwsgi services tags: