aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-04-12 14:39:29 +0000
committerGerrit Code Review <review@openstack.org>2016-04-12 14:39:29 +0000
commit34460c37c62b46391dcf8fb9eaaea2b5b4c8bb7a (patch)
treece2c845b3a97043be6e3178d634ebc56def367e6
parente2b250f7c3cd008bcbd31d246c5dd71db3aa7de4 (diff)
parentd73ee4a856b84b5d19d7b604f49ce5cbb8d061d4 (diff)
downloadkolla-34460c37c62b46391dcf8fb9eaaea2b5b4c8bb7a.tar.gz
kolla-34460c37c62b46391dcf8fb9eaaea2b5b4c8bb7a.zip
Merge "Rabbitmq Upgrade restarts container only when image was changed."
-rw-r--r--ansible/roles/rabbitmq/tasks/upgrade.yml21
1 files changed, 18 insertions, 3 deletions
diff --git a/ansible/roles/rabbitmq/tasks/upgrade.yml b/ansible/roles/rabbitmq/tasks/upgrade.yml
index aaf91cbb9..e76d3b872 100644
--- a/ansible/roles/rabbitmq/tasks/upgrade.yml
+++ b/ansible/roles/rabbitmq/tasks/upgrade.yml
@@ -1,4 +1,13 @@
---
+- name: Checking if rabbitmq container needs upgrading
+ kolla_docker:
+ action: "compare_image"
+ common_options: "{{ docker_common_options }}"
+ name: "rabbitmq"
+ image: "{{ rabbitmq_image_full }}"
+ when: inventory_hostname in groups['rabbitmq']
+ register: rabbitmq_differs
+
- include: config.yml
- name: Find gospel node
@@ -13,10 +22,16 @@
action: "stop_container"
common_options: "{{ docker_common_options }}"
name: "rabbitmq"
- when: rabbitmq_hostname != (gospel_node.stdout | from_json).hostname
+ when:
+ - rabbitmq_hostname != (gospel_node.stdout | from_json).hostname
+ - rabbitmq_differs['result']
- include: start.yml
- when: rabbitmq_hostname == (gospel_node.stdout | from_json).hostname
+ when:
+ - rabbitmq_hostname == (gospel_node.stdout | from_json).hostname
+ - rabbitmq_differs['result']
- include: start.yml
- when: rabbitmq_hostname != (gospel_node.stdout | from_json).hostname
+ when:
+ - rabbitmq_hostname != (gospel_node.stdout | from_json).hostname
+ - rabbitmq_differs['result']