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:
parent
235bc0d037
commit
e26aabe440
@ -56,19 +56,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 <https://github.com/Logan2211/ansible-haproxy-endpoints>`_
|
||||
used by the openstack-ansible project.
|
||||
|
||||
Tags
|
||||
~~~~
|
||||
|
||||
|
@ -106,7 +106,3 @@
|
||||
listen: flush cache
|
||||
when:
|
||||
- keystone_flush_memcache | bool
|
||||
|
||||
- meta: noop
|
||||
listen: Manage LB
|
||||
when: false
|
||||
|
@ -43,7 +43,6 @@
|
||||
- ansible_facts['pkg_mgr'] == 'apt'
|
||||
- item.state == 'present'
|
||||
notify:
|
||||
- Manage LB
|
||||
- Restart web server
|
||||
|
||||
- name: Place apache2 config files
|
||||
@ -54,7 +53,6 @@
|
||||
group: "root"
|
||||
with_items: "{{ keystone_apache_configs }}"
|
||||
notify:
|
||||
- Manage LB
|
||||
- Restart web server
|
||||
|
||||
## NOTE(cloudnull):
|
||||
@ -68,7 +66,6 @@
|
||||
- ansible_facts['pkg_mgr'] == 'apt'
|
||||
- item.state == 'absent'
|
||||
notify:
|
||||
- Manage LB
|
||||
- Restart web server
|
||||
|
||||
## NOTE(andymccr):
|
||||
@ -81,7 +78,6 @@
|
||||
when:
|
||||
- ansible_facts['pkg_mgr'] == 'dnf'
|
||||
notify:
|
||||
- Manage LB
|
||||
- Restart web server
|
||||
|
||||
- name: Disable default apache site
|
||||
@ -90,7 +86,6 @@
|
||||
state: "absent"
|
||||
with_items: "{{ keystone_apache_default_sites }}"
|
||||
notify:
|
||||
- Manage LB
|
||||
- Restart web server
|
||||
|
||||
- name: Enabled keystone vhost
|
||||
@ -102,7 +97,6 @@
|
||||
- keystone_apache_site_available is defined
|
||||
- keystone_apache_site_enabled is defined
|
||||
notify:
|
||||
- Manage LB
|
||||
- Restart web server
|
||||
|
||||
- name: Ensure Apache ServerName
|
||||
@ -110,7 +104,6 @@
|
||||
dest: "{{ keystone_apache_conf }}"
|
||||
line: "ServerName {{ ansible_facts['hostname'] }}"
|
||||
notify:
|
||||
- Manage LB
|
||||
- Restart web server
|
||||
|
||||
- name: Ensure Apache ServerTokens
|
||||
@ -119,7 +112,6 @@
|
||||
regexp: '^ServerTokens'
|
||||
line: "ServerTokens {{ keystone_apache_servertokens }}"
|
||||
notify:
|
||||
- Manage LB
|
||||
- Restart web server
|
||||
|
||||
- name: Ensure Apache ServerSignature
|
||||
@ -128,7 +120,6 @@
|
||||
regexp: '^ServerSignature'
|
||||
line: "ServerSignature {{ keystone_apache_serversignature }}"
|
||||
notify:
|
||||
- Manage LB
|
||||
- Restart web server
|
||||
|
||||
- name: Remove Listen from Apache config
|
||||
@ -138,5 +129,4 @@
|
||||
backrefs: yes
|
||||
line: '#\1'
|
||||
notify:
|
||||
- Manage LB
|
||||
- Restart web server
|
||||
|
@ -66,7 +66,6 @@
|
||||
(ansible_local['openstack_ansible']['keystone']['need_db_migrate'] | bool)"
|
||||
- "(item.status['LoadState'] == 'loaded' | bool)"
|
||||
notify:
|
||||
- Manage LB
|
||||
- Restart uWSGI
|
||||
|
||||
- name: Perform a Keystone DB sync expand
|
||||
|
@ -38,7 +38,6 @@
|
||||
- { content: "{{ shibboleth_cert_user_content }}", dest: "/etc/shibboleth/sp-cert.pem" }
|
||||
- { content: "{{ shibboleth_key_user_content }}", dest: "/etc/shibboleth/sp-key.pem" }
|
||||
notify:
|
||||
- Manage LB
|
||||
- Restart web server
|
||||
- Restart Shibd
|
||||
|
||||
@ -48,7 +47,6 @@
|
||||
creates: "/etc/shibboleth/sp-cert.pem"
|
||||
when: _keystone_is_first_play_host
|
||||
notify:
|
||||
- Manage LB
|
||||
- Restart web server
|
||||
- Restart Shibd
|
||||
|
||||
@ -81,7 +79,6 @@
|
||||
mode: "0640"
|
||||
when: not _keystone_is_first_play_host
|
||||
notify:
|
||||
- Manage LB
|
||||
- Restart web server
|
||||
- Restart Shibd
|
||||
|
||||
@ -94,7 +91,6 @@
|
||||
mode: "0640"
|
||||
when: not _keystone_is_first_play_host
|
||||
notify:
|
||||
- Manage LB
|
||||
- Restart web server
|
||||
- Restart Shibd
|
||||
|
||||
@ -108,6 +104,5 @@
|
||||
- "/etc/shibboleth/sp-key.pem"
|
||||
when: not _keystone_is_first_play_host
|
||||
notify:
|
||||
- Manage LB
|
||||
- Restart web server
|
||||
- Restart Shibd
|
||||
|
@ -20,7 +20,6 @@
|
||||
become_user: "{{ keystone_system_user_name }}"
|
||||
when: keystone_idp != {}
|
||||
notify:
|
||||
- Manage LB
|
||||
- Restart uWSGI
|
||||
|
||||
- name: Register service providers
|
||||
|
@ -58,7 +58,6 @@
|
||||
retries: 5
|
||||
delay: 2
|
||||
notify:
|
||||
- Manage LB
|
||||
- Restart web server
|
||||
|
||||
- name: Install/remove apache mod packages for federated authentication
|
||||
@ -136,5 +135,4 @@
|
||||
state: link
|
||||
force: yes
|
||||
notify:
|
||||
- Manage LB
|
||||
- Restart web server
|
||||
|
@ -42,7 +42,6 @@
|
||||
with_dict: "{{ keystone_ldap }}"
|
||||
no_log: true
|
||||
notify:
|
||||
- Manage LB
|
||||
- Restart uWSGI
|
||||
- Restart web server
|
||||
|
||||
@ -55,6 +54,5 @@
|
||||
state: absent
|
||||
when: keystone_ldap.Default is not defined
|
||||
notify:
|
||||
- Manage LB
|
||||
- Restart uWSGI
|
||||
- Restart web server
|
||||
|
@ -37,7 +37,6 @@
|
||||
config_overrides: "{{ keystone_keystone_conf_overrides }}"
|
||||
config_type: "ini"
|
||||
notify:
|
||||
- Manage LB
|
||||
- Restart uWSGI
|
||||
- Restart web server
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user