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: Ib21a5f5caa590daa827e45d26015bf32abe39cf2
This commit is contained in:
Dmitriy Rabotyagov 2022-06-14 14:42:36 +02:00
parent 235bc0d037
commit e26aabe440
9 changed files with 0 additions and 39 deletions

View File

@ -56,19 +56,6 @@ Example playbook
.. literalinclude:: ../../examples/playbook.yml .. literalinclude:: ../../examples/playbook.yml
:language: yaml :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 <https://github.com/Logan2211/ansible-haproxy-endpoints>`_
used by the openstack-ansible project.
Tags Tags
~~~~ ~~~~

View File

@ -106,7 +106,3 @@
listen: flush cache listen: flush cache
when: when:
- keystone_flush_memcache | bool - keystone_flush_memcache | bool
- meta: noop
listen: Manage LB
when: false

View File

@ -43,7 +43,6 @@
- ansible_facts['pkg_mgr'] == 'apt' - ansible_facts['pkg_mgr'] == 'apt'
- item.state == 'present' - item.state == 'present'
notify: notify:
- Manage LB
- Restart web server - Restart web server
- name: Place apache2 config files - name: Place apache2 config files
@ -54,7 +53,6 @@
group: "root" group: "root"
with_items: "{{ keystone_apache_configs }}" with_items: "{{ keystone_apache_configs }}"
notify: notify:
- Manage LB
- Restart web server - Restart web server
## NOTE(cloudnull): ## NOTE(cloudnull):
@ -68,7 +66,6 @@
- ansible_facts['pkg_mgr'] == 'apt' - ansible_facts['pkg_mgr'] == 'apt'
- item.state == 'absent' - item.state == 'absent'
notify: notify:
- Manage LB
- Restart web server - Restart web server
## NOTE(andymccr): ## NOTE(andymccr):
@ -81,7 +78,6 @@
when: when:
- ansible_facts['pkg_mgr'] == 'dnf' - ansible_facts['pkg_mgr'] == 'dnf'
notify: notify:
- Manage LB
- Restart web server - Restart web server
- name: Disable default apache site - name: Disable default apache site
@ -90,7 +86,6 @@
state: "absent" state: "absent"
with_items: "{{ keystone_apache_default_sites }}" with_items: "{{ keystone_apache_default_sites }}"
notify: notify:
- Manage LB
- Restart web server - Restart web server
- name: Enabled keystone vhost - name: Enabled keystone vhost
@ -102,7 +97,6 @@
- keystone_apache_site_available is defined - keystone_apache_site_available is defined
- keystone_apache_site_enabled is defined - keystone_apache_site_enabled is defined
notify: notify:
- Manage LB
- Restart web server - Restart web server
- name: Ensure Apache ServerName - name: Ensure Apache ServerName
@ -110,7 +104,6 @@
dest: "{{ keystone_apache_conf }}" dest: "{{ keystone_apache_conf }}"
line: "ServerName {{ ansible_facts['hostname'] }}" line: "ServerName {{ ansible_facts['hostname'] }}"
notify: notify:
- Manage LB
- Restart web server - Restart web server
- name: Ensure Apache ServerTokens - name: Ensure Apache ServerTokens
@ -119,7 +112,6 @@
regexp: '^ServerTokens' regexp: '^ServerTokens'
line: "ServerTokens {{ keystone_apache_servertokens }}" line: "ServerTokens {{ keystone_apache_servertokens }}"
notify: notify:
- Manage LB
- Restart web server - Restart web server
- name: Ensure Apache ServerSignature - name: Ensure Apache ServerSignature
@ -128,7 +120,6 @@
regexp: '^ServerSignature' regexp: '^ServerSignature'
line: "ServerSignature {{ keystone_apache_serversignature }}" line: "ServerSignature {{ keystone_apache_serversignature }}"
notify: notify:
- Manage LB
- Restart web server - Restart web server
- name: Remove Listen from Apache config - name: Remove Listen from Apache config
@ -138,5 +129,4 @@
backrefs: yes backrefs: yes
line: '#\1' line: '#\1'
notify: notify:
- Manage LB
- Restart web server - Restart web server

View File

@ -66,7 +66,6 @@
(ansible_local['openstack_ansible']['keystone']['need_db_migrate'] | bool)" (ansible_local['openstack_ansible']['keystone']['need_db_migrate'] | bool)"
- "(item.status['LoadState'] == 'loaded' | bool)" - "(item.status['LoadState'] == 'loaded' | bool)"
notify: notify:
- Manage LB
- Restart uWSGI - Restart uWSGI
- name: Perform a Keystone DB sync expand - name: Perform a Keystone DB sync expand

View File

@ -38,7 +38,6 @@
- { content: "{{ shibboleth_cert_user_content }}", dest: "/etc/shibboleth/sp-cert.pem" } - { content: "{{ shibboleth_cert_user_content }}", dest: "/etc/shibboleth/sp-cert.pem" }
- { content: "{{ shibboleth_key_user_content }}", dest: "/etc/shibboleth/sp-key.pem" } - { content: "{{ shibboleth_key_user_content }}", dest: "/etc/shibboleth/sp-key.pem" }
notify: notify:
- Manage LB
- Restart web server - Restart web server
- Restart Shibd - Restart Shibd
@ -48,7 +47,6 @@
creates: "/etc/shibboleth/sp-cert.pem" creates: "/etc/shibboleth/sp-cert.pem"
when: _keystone_is_first_play_host when: _keystone_is_first_play_host
notify: notify:
- Manage LB
- Restart web server - Restart web server
- Restart Shibd - Restart Shibd
@ -81,7 +79,6 @@
mode: "0640" mode: "0640"
when: not _keystone_is_first_play_host when: not _keystone_is_first_play_host
notify: notify:
- Manage LB
- Restart web server - Restart web server
- Restart Shibd - Restart Shibd
@ -94,7 +91,6 @@
mode: "0640" mode: "0640"
when: not _keystone_is_first_play_host when: not _keystone_is_first_play_host
notify: notify:
- Manage LB
- Restart web server - Restart web server
- Restart Shibd - Restart Shibd
@ -108,6 +104,5 @@
- "/etc/shibboleth/sp-key.pem" - "/etc/shibboleth/sp-key.pem"
when: not _keystone_is_first_play_host when: not _keystone_is_first_play_host
notify: notify:
- Manage LB
- Restart web server - Restart web server
- Restart Shibd - Restart Shibd

View File

@ -20,7 +20,6 @@
become_user: "{{ keystone_system_user_name }}" become_user: "{{ keystone_system_user_name }}"
when: keystone_idp != {} when: keystone_idp != {}
notify: notify:
- Manage LB
- Restart uWSGI - Restart uWSGI
- name: Register service providers - name: Register service providers

View File

@ -58,7 +58,6 @@
retries: 5 retries: 5
delay: 2 delay: 2
notify: notify:
- Manage LB
- Restart web server - Restart web server
- name: Install/remove apache mod packages for federated authentication - name: Install/remove apache mod packages for federated authentication
@ -136,5 +135,4 @@
state: link state: link
force: yes force: yes
notify: notify:
- Manage LB
- Restart web server - Restart web server

View File

@ -42,7 +42,6 @@
with_dict: "{{ keystone_ldap }}" with_dict: "{{ keystone_ldap }}"
no_log: true no_log: true
notify: notify:
- Manage LB
- Restart uWSGI - Restart uWSGI
- Restart web server - Restart web server
@ -55,6 +54,5 @@
state: absent state: absent
when: keystone_ldap.Default is not defined when: keystone_ldap.Default is not defined
notify: notify:
- Manage LB
- Restart uWSGI - Restart uWSGI
- Restart web server - Restart web server

View File

@ -37,7 +37,6 @@
config_overrides: "{{ keystone_keystone_conf_overrides }}" config_overrides: "{{ keystone_keystone_conf_overrides }}"
config_type: "ini" config_type: "ini"
notify: notify:
- Manage LB
- Restart uWSGI - Restart uWSGI
- Restart web server - Restart web server