openstack/kolla-ansible
Code Issues Proposed changes

Make outward_rabbit pre-checks idempotent

Browse Source 
Copy the patterns from the rabbit checks, skip some pre-checks when the
container has already been started. Without this change the pre-checks
fail when you re-run the deploy, i.e. the port is not free because
rabbit is already running on that port.

This bug was triggered because murano is enabled, and this change has
been added to add the extra rabbitmq instance by default:
d8fe3ea780c188b6e937ab6f08a8475d2330a9fa

Closes-Bug: #1715135

Change-Id: I0eb8785e7cd4eadfa792ea14a27f54a891b2bf02
This commit is contained in:
John Garbutt 2017-09-05 11:17:59 +01:00
parent cf00aa6997
commit 7e9fa0cd41
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ansible/roles/rabbitmq/tasks/precheck.yml
View File

@ -3,6 +3,7 @@
kolla_container_facts: kolla_container_facts:
name: name:
- rabbitmq - rabbitmq
- outward_rabbitmq
register: container_facts register: container_facts
- name: Checking free port for RabbitMQ - name: Checking free port for RabbitMQ
@ -69,6 +70,7 @@
when: when:
- enable_outward_rabbitmq | bool - enable_outward_rabbitmq | bool
- inventory_hostname in groups['outward-rabbitmq'] - inventory_hostname in groups['outward-rabbitmq']
- container_facts['outward_rabbitmq'] is not defined
- name: Checking free port for outward RabbitMQ Management - name: Checking free port for outward RabbitMQ Management
wait_for: wait_for:
@ -79,6 +81,7 @@
when: when:
- enable_outward_rabbitmq | bool - enable_outward_rabbitmq | bool
- inventory_hostname in groups['outward-rabbitmq'] - inventory_hostname in groups['outward-rabbitmq']
- container_facts['outward_rabbitmq'] is not defined
- name: Checking free port for outward RabbitMQ Cluster - name: Checking free port for outward RabbitMQ Cluster
wait_for: wait_for:
@ -89,6 +92,7 @@
when: when:
- enable_outward_rabbitmq | bool - enable_outward_rabbitmq | bool
- inventory_hostname in groups['outward-rabbitmq'] - inventory_hostname in groups['outward-rabbitmq']
- container_facts['outward_rabbitmq'] is not defined
- name: Checking free port for outward RabbitMQ EPMD - name: Checking free port for outward RabbitMQ EPMD
wait_for: wait_for:
@ -99,6 +103,7 @@
when: when:
- enable_outward_rabbitmq | bool - enable_outward_rabbitmq | bool
- inventory_hostname in groups['outward-rabbitmq'] - inventory_hostname in groups['outward-rabbitmq']
- container_facts['outward_rabbitmq'] is not defined
- name: Check if all outward rabbit hostnames are resolvable - name: Check if all outward rabbit hostnames are resolvable
command: "getent ahostsv4 {{ hostvars[item]['ansible_hostname'] }}" command: "getent ahostsv4 {{ hostvars[item]['ansible_hostname'] }}"