Skip to content

Commit b2cbd5b

Browse files
authored
Merge pull request #6 from hellofresh/fix/ansible-updates
Support new version of ansible
2 parents cd51d4a + aaaa0f3 commit b2cbd5b

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22
language: python
33
python: "2.7"
44
before_install:
5+
# Untravis rabbitmq-server repo
6+
- sudo rm -fr /etc/apt/sources.list.d/rabbitmq_rabbitmq-server.list*
57
- sudo apt-get update -qq
8+
# Remove existing rabbitmq-server-package
69
- sudo apt-get purge rabbitmq-server
710
install:
811
# Install Ansible.

tasks/cluster/checks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
- name: check | cluster group should be valid
44
fail:
55
msg="Your configuration is not valid 'rabbitmq_cluster_group' varaible with value '{{ rabbitmq_cluster_group }}' is not valid group."
6-
when: "{{ groups[rabbitmq_cluster_group] is not defined }}"
6+
when: groups[rabbitmq_cluster_group] is not defined
77

88
- name: check | get rabbitmq version in each node in the cluster
99
shell: rabbitmqctl status|grep "{rabbit,\"RabbitMQ\"" | cut -d, -f3 | cut -d "\"" -f2
@@ -25,4 +25,4 @@
2525
fail:
2626
msg="Rabbiqmq version in cluster dont match. Node versions = {{rabbit_cluster_nodes_version }}"
2727
run_once: true
28-
when: "{{ rabbit_cluster_nodes_version | selectattr('version', 'equalto', rabbit_cluster_nodes_version[0]['version']) | list != rabbit_cluster_nodes_version }}"
28+
when: rabbit_cluster_nodes_version | selectattr('version', 'equalto', rabbit_cluster_nodes_version[0]['version']) | list != rabbit_cluster_nodes_version

tasks/cluster/cluster.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
shell: "rabbitmqctl cluster_status | grep {{ rabbitmq_cluster_instance_to_join }}"
55
changed_when: False
66
ignore_errors: True
7-
when: "{{ rabbitmq_cluster_instance_to_join != ansible_fqdn }}"
7+
when: rabbitmq_cluster_instance_to_join != ansible_fqdn
88
register: cluster_result
99

1010
- name: cluster | stop rabbitmq app for standalone nodes in order to join

tasks/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
when: rabbitmq_federation
1515

1616
- include: policy.yml
17-
when: "rabbitmq_policy_configuration is defined"
17+
when: rabbitmq_policy_configuration is defined
1818

1919
- block:
2020
- include: cluster/checks.yml

0 commit comments

Comments
 (0)