From 604085ffe6b08df8291a0c12d09961a7b6fb8663 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Tue, 14 Jun 2022 19:41:53 +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: I3693ee3a9a756161324e3a79464f9650fb7a9f1a --- doc/source/index.rst | 13 ------------- handlers/main.yml | 4 ---- tasks/consoles/nova_console_novnc_install.yml | 1 - tasks/consoles/nova_console_novnc_ssl.yml | 1 - tasks/consoles/nova_console_spice_install.yml | 1 - tasks/nova_post_install.yml | 3 --- 6 files changed, 23 deletions(-) diff --git a/doc/source/index.rst b/doc/source/index.rst index 16f5884d..4f4df709 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -35,19 +35,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 0e400df5..e281e3bd 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -86,7 +86,3 @@ - "Restart nova services" - "venv changed" - "cert installed" - -- meta: noop - listen: Manage LB - when: false diff --git a/tasks/consoles/nova_console_novnc_install.yml b/tasks/consoles/nova_console_novnc_install.yml index e0966a2c..fd19dbf9 100644 --- a/tasks/consoles/nova_console_novnc_install.yml +++ b/tasks/consoles/nova_console_novnc_install.yml @@ -54,7 +54,6 @@ delay: 2 when: nova_install_method == 'source' notify: - - Manage LB - Restart nova services - Restart uwsgi services tags: diff --git a/tasks/consoles/nova_console_novnc_ssl.yml b/tasks/consoles/nova_console_novnc_ssl.yml index fcb680a6..cc20513f 100644 --- a/tasks/consoles/nova_console_novnc_ssl.yml +++ b/tasks/consoles/nova_console_novnc_ssl.yml @@ -41,7 +41,6 @@ - { content: "{{ nova_console_user_ssl_combined.stdout ~ '\n' }}", dest: "{{ nova_console_ssl_cert }}", mode: "0644" } - { src: "{{ nova_console_user_ssl_key }}", dest: "{{ nova_console_ssl_key }}", mode: "0640" } notify: - - Manage LB - Restart nova services - Restart uwsgi services tags: diff --git a/tasks/consoles/nova_console_spice_install.yml b/tasks/consoles/nova_console_spice_install.yml index ee6044b1..050753eb 100644 --- a/tasks/consoles/nova_console_spice_install.yml +++ b/tasks/consoles/nova_console_spice_install.yml @@ -54,7 +54,6 @@ delay: 2 when: nova_install_method == 'source' or ansible_facts['os_family'] | lower == 'redhat' notify: - - Manage LB - Restart nova services - Restart uwsgi services tags: diff --git a/tasks/nova_post_install.yml b/tasks/nova_post_install.yml index 534b9ea3..67a6e298 100644 --- a/tasks/nova_post_install.yml +++ b/tasks/nova_post_install.yml @@ -48,7 +48,6 @@ with_fileglob: - rootwrap.d/* notify: - - Manage LB - Restart nova services - Restart uwsgi services tags: @@ -74,7 +73,6 @@ config_overrides: "{{ nova_vendor_data_overrides }}" config_type: "json" notify: - - Manage LB - Restart nova services - Restart uwsgi services tags: @@ -151,7 +149,6 @@ path: /etc/nova/nova-compute.conf state: absent notify: - - Manage LB - Restart nova services - Restart uwsgi services tags: