Merge "Fix RabbitMQ hostname address resolution precheck"

This commit is contained in:
Zuul 2020-02-26 10:57:01 +00:00 committed by Gerrit Code Review
commit 9014d8389a
2 changed files with 18 additions and 8 deletions

View File

@ -59,12 +59,14 @@
register: rabbitmq_hostnames register: rabbitmq_hostnames
with_items: "{{ groups['rabbitmq'] }}" with_items: "{{ groups['rabbitmq'] }}"
- name: Check if rabbit hostname resolves to IP address of api_interface - name: Check if each rabbit hostname resolves uniquely to the proper IP address
fail: fail:
msg: "Hostname has to resolve to IP address of api_interface" msg: Hostname has to resolve uniquely to the IP address of api_interface
with_items: "{{ rabbitmq_hostnames.results }}" with_subelements:
- "{{ rabbitmq_hostnames.results }}"
- stdout_lines
when: when:
- "item.stdout.find('api' | kolla_address(item['item'])) == -1" - not item.1 is match('^'+('api' | kolla_address(item.0.item))+'\\b')
- name: Checking free port for outward RabbitMQ - name: Checking free port for outward RabbitMQ
wait_for: wait_for:
@ -120,10 +122,12 @@
when: when:
- enable_outward_rabbitmq | bool - enable_outward_rabbitmq | bool
- name: Check if rabbit hostname resolves to IP address of api_interface - name: Check if each rabbit hostname resolves uniquely to the proper IP address
fail: fail:
msg: "Hostname has to resolve to IP address of api_interface" msg: Hostname has to resolve uniquely to the IP address of api_interface
with_items: "{{ outward_rabbitmq_hostnames.results }}" with_subelements:
- "{{ outward_rabbitmq_hostnames.results }}"
- stdout_lines
when: when:
- enable_outward_rabbitmq | bool - enable_outward_rabbitmq | bool
- "item.stdout.find('api' | kolla_address(item['item'])) == -1" - not item.1 is match('^'+('api' | kolla_address(item.0.item))+'\\b')

View File

@ -0,0 +1,6 @@
---
fixes:
- |
Makes RabbitMQ hostname address resolution precheck stronger by
requiring uniqueness of resolution to avoid later issues.
`LP#1863363 <https://launchpad.net/bugs/1863363>`