diff options
author | Larry Smith Jr <mrlesmithjr@gmail.com> | 2016-12-03 16:41:53 -0500 |
---|---|---|
committer | Larry Smith Jr <mrlesmithjr@gmail.com> | 2016-12-03 16:41:53 -0500 |
commit | da8e343df912e94703a8094f5e62d4c1bcc57345 (patch) | |
tree | 5ba5cbbff9050e22580961eaeefbe1a4dcd3c82b /tasks | |
parent | 6b75df2e01f267bf7153baa310d794b7e9bae143 (diff) | |
download | ansible-rabbitmq-da8e343df912e94703a8094f5e62d4c1bcc57345.tar.gz ansible-rabbitmq-da8e343df912e94703a8094f5e62d4c1bcc57345.tar.zst ansible-rabbitmq-da8e343df912e94703a8094f5e62d4c1bcc57345.zip |
Addressed issue #5
Signed-off-by: Larry Smith Jr <mrlesmithjr@gmail.com>
Diffstat (limited to 'tasks')
-rw-r--r-- | tasks/main.yml | 4 | ||||
-rw-r--r-- | tasks/rabbitmq_clustering.yml | 4 | ||||
-rw-r--r-- | tasks/rabbitmq_users.yml | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tasks/main.yml b/tasks/main.yml index 26abc8d..bd82f93 100644 --- a/tasks/main.yml +++ b/tasks/main.yml | |||
@@ -13,9 +13,9 @@ | |||
13 | register: clustered | 13 | register: clustered |
14 | 14 | ||
15 | - include: rabbitmq_clustering.yml | 15 | - include: rabbitmq_clustering.yml |
16 | when: enable_rabbitmq_clustering and (clustered.stat.exists != True) | 16 | when: rabbitmq_enable_clustering and (clustered.stat.exists != True) |
17 | 17 | ||
18 | - include: rabbitmq_ha_config.yml | 18 | - include: rabbitmq_ha_config.yml |
19 | when: config_rabbitmq_ha and enable_rabbitmq_clustering | 19 | when: rabbitmq_config_ha and rabbitmq_enable_clustering |
20 | 20 | ||
21 | - include: rabbitmq_users.yml | 21 | - include: rabbitmq_users.yml |
diff --git a/tasks/rabbitmq_clustering.yml b/tasks/rabbitmq_clustering.yml index f9b5157..9dece46 100644 --- a/tasks/rabbitmq_clustering.yml +++ b/tasks/rabbitmq_clustering.yml | |||
@@ -12,13 +12,13 @@ | |||
12 | 12 | ||
13 | #- name: grabbing erlang cookie | 13 | #- name: grabbing erlang cookie |
14 | # shell: cat /var/lib/rabbitmq/.erlang.cookie | 14 | # shell: cat /var/lib/rabbitmq/.erlang.cookie |
15 | # register: erlang_cookie | 15 | # register: rabbitmq_erlang_cookie |
16 | # when: inventory_hostname == "{{ rabbitmq_master }}" | 16 | # when: inventory_hostname == "{{ rabbitmq_master }}" |
17 | 17 | ||
18 | - name: rabbitmq_clustering | copy erlang cookie | 18 | - name: rabbitmq_clustering | copy erlang cookie |
19 | template: | 19 | template: |
20 | src: erlang.cookie.j2 | 20 | src: erlang.cookie.j2 |
21 | dest: "{{ erlang_cookie_file }}" | 21 | dest: "{{ rabbitmq_erlang_cookie_file }}" |
22 | owner: rabbitmq | 22 | owner: rabbitmq |
23 | group: rabbitmq | 23 | group: rabbitmq |
24 | mode: 0400 | 24 | mode: 0400 |
diff --git a/tasks/rabbitmq_users.yml b/tasks/rabbitmq_users.yml index 3e1997a..8bce8b2 100644 --- a/tasks/rabbitmq_users.yml +++ b/tasks/rabbitmq_users.yml | |||
@@ -10,7 +10,7 @@ | |||
10 | tags: "{{ item.tags }}" | 10 | tags: "{{ item.tags }}" |
11 | state: present | 11 | state: present |
12 | with_items: "{{ rabbitmq_users }}" | 12 | with_items: "{{ rabbitmq_users }}" |
13 | when: (enable_rabbitmq_clustering is defined and not enable_rabbitmq_clustering) or enable_rabbitmq_clustering is not defined | 13 | when: (rabbitmq_enable_clustering is defined and not rabbitmq_enable_clustering) or rabbitmq_enable_clustering is not defined |
14 | 14 | ||
15 | - name: rabbitmq_users | creating rabbitmq users | 15 | - name: rabbitmq_users | creating rabbitmq users |
16 | rabbitmq_user: | 16 | rabbitmq_user: |
@@ -24,4 +24,4 @@ | |||
24 | state: present | 24 | state: present |
25 | run_once: yes | 25 | run_once: yes |
26 | with_items: "{{ rabbitmq_users }}" | 26 | with_items: "{{ rabbitmq_users }}" |
27 | when: (enable_rabbitmq_clustering is defined and enable_rabbitmq_clustering) | 27 | when: (rabbitmq_enable_clustering is defined and rabbitmq_enable_clustering) |