From 6f044eacfa5f67607c5b0ebf1dd7b05a0f7fef8d Mon Sep 17 00:00:00 2001 From: Will Kahn-Greene Date: Thu, 21 Jan 2016 15:07:30 -0500 Subject: [PATCH] Fix bug 1241554: Fixes rabbitmq task to work with ansible 2 This tweaks bits of the rabbitmq task using the changes in this PR: https://github.com/Mayeu/ansible-playbook-rabbitmq/pull/56/ That allows the task to work with both ansible 1.9 and 2. --- .../tasks/{install/debian.yml => install-debian.yml} | 2 +- .../tasks/{install/redhat.yml => install-redhat.yml} | 0 provisioning/roles/Mayeu.RabbitMQ/tasks/main.yml | 5 ++++- 3 files changed, 5 insertions(+), 2 deletions(-) rename provisioning/roles/Mayeu.RabbitMQ/tasks/{install/debian.yml => install-debian.yml} (93%) rename provisioning/roles/Mayeu.RabbitMQ/tasks/{install/redhat.yml => install-redhat.yml} (100%) diff --git a/provisioning/roles/Mayeu.RabbitMQ/tasks/install/debian.yml b/provisioning/roles/Mayeu.RabbitMQ/tasks/install-debian.yml similarity index 93% rename from provisioning/roles/Mayeu.RabbitMQ/tasks/install/debian.yml rename to provisioning/roles/Mayeu.RabbitMQ/tasks/install-debian.yml index 3ecfd1810ec..c4ddb291fde 100644 --- a/provisioning/roles/Mayeu.RabbitMQ/tasks/install/debian.yml +++ b/provisioning/roles/Mayeu.RabbitMQ/tasks/install-debian.yml @@ -7,7 +7,7 @@ - name: add the official rabbitmq repository copy: - src=../../files/rabbitmq.list + src=rabbitmq.list dest=/etc/apt/sources.list.d/ backup=yes register: aptrepo diff --git a/provisioning/roles/Mayeu.RabbitMQ/tasks/install/redhat.yml b/provisioning/roles/Mayeu.RabbitMQ/tasks/install-redhat.yml similarity index 100% rename from provisioning/roles/Mayeu.RabbitMQ/tasks/install/redhat.yml rename to provisioning/roles/Mayeu.RabbitMQ/tasks/install-redhat.yml diff --git a/provisioning/roles/Mayeu.RabbitMQ/tasks/main.yml b/provisioning/roles/Mayeu.RabbitMQ/tasks/main.yml index 2c5c1ac6b01..b8b4568ecf5 100644 --- a/provisioning/roles/Mayeu.RabbitMQ/tasks/main.yml +++ b/provisioning/roles/Mayeu.RabbitMQ/tasks/main.yml @@ -1,5 +1,8 @@ --- -- include: install/main.yml +- include: install-debian.yml + when: ansible_os_family == 'Debian' +- include: install-redhat.yml + when: ansible_os_family == 'RedHat' - include: configuration.yml - include: plugins.yml - include: vhost.yml