openstack/kolla-ansible
Code Issues Proposed changes

Omit outward_rabbitmq from check for upgrade

Browse Source 
Upgrade fails as outward_rabbitmq does not exist
 and cannot therefore be upgraded. Omit it from the
 upgrade check and bootstrap it after rabbitmq upgrade.

 Remove jinja2 from 'Find gospel node' task; removes warnings.

Change-Id: I3766271c62779c8dbd31e7cf2300473815bbbe68
This commit is contained in:
Mick Thompson 2017-07-12 10:11:32 +01:00
parent 2d06ef399c
commit c618dbcd0e
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ansible/roles/rabbitmq/tasks/upgrade.yml
View File

@ -1,4 +1,5 @@
--- ---
# TODO(mickt): Revert Change I3766271c62779c8dbd31e7cf2300473815bbbe68 when Pike is released.
- name: Checking if rabbitmq container needs upgrading - name: Checking if rabbitmq container needs upgrading
vars: vars:
service_name: "rabbitmq" service_name: "rabbitmq"
@ -9,17 +10,21 @@
name: "{{ project_name }}" name: "{{ project_name }}"
image: "{{ rabbitmq_image_full }}" image: "{{ rabbitmq_image_full }}"
environment: "{{ service.environment }}" environment: "{{ service.environment }}"
when: inventory_hostname in groups[role_rabbitmq_groups] when:
- inventory_hostname in groups[role_rabbitmq_groups]
- project_name == "rabbitmq"
register: rabbitmq_differs register: rabbitmq_differs
- include: config.yml - include: config.yml
when: project_name == "rabbitmq"
- name: Find gospel node - name: Find gospel node
command: docker exec -t {{ project_name }} /usr/local/bin/rabbitmq_get_gospel_node command: docker exec -t {{ project_name }} /usr/local/bin/rabbitmq_get_gospel_node
changed_when: "{{ (gospel_node.stdout | from_json).changed }}" changed_when: "(gospel_node.stdout | from_json).changed"
failed_when: "{{ (gospel_node.stdout | from_json).failed }}" failed_when: "(gospel_node.stdout | from_json).failed"
register: gospel_node register: gospel_node
run_once: True run_once: True
when: project_name == "rabbitmq"
- name: Stopping non-gospel nodes - name: Stopping non-gospel nodes
kolla_docker: kolla_docker:
@ -27,17 +32,20 @@
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
name: "{{ project_name }}" name: "{{ project_name }}"
when: when:
- project_name == "rabbitmq"
- rabbitmq_hostname != (gospel_node.stdout | from_json).hostname - rabbitmq_hostname != (gospel_node.stdout | from_json).hostname
- rabbitmq_differs['result'] - rabbitmq_differs['result']
- name: Flush handlers - name: Flush handlers
meta: flush_handlers meta: flush_handlers
when: when:
- project_name == "rabbitmq"
- rabbitmq_hostname == (gospel_node.stdout | from_json).hostname - rabbitmq_hostname == (gospel_node.stdout | from_json).hostname
- rabbitmq_differs['result'] - rabbitmq_differs['result']
- name: Flush handlers - name: Flush handlers
meta: flush_handlers meta: flush_handlers
when: when:
- project_name == "rabbitmq"
- rabbitmq_hostname != (gospel_node.stdout | from_json).hostname - rabbitmq_hostname != (gospel_node.stdout | from_json).hostname
- rabbitmq_differs['result'] - rabbitmq_differs['result']