Skip to content

Commit

Permalink
Check and set cookie without using a failed task
Browse files Browse the repository at this point in the history
Currently the checking of the cookie content uses
a try/rescue block and for a new install always
results in a failed task. This causes a lot of
confusion due to the failed task report.

This patch improves the process by executing the
stop/start if the cookie file is changed in any
way by the copy task. This is far simpler and
results in no task fails.

As all the tasks related to this were marked
rabbitmq-config the tag implementation is set
in the main tasks file and removed from all the
individual tasks.

Change-Id: Iba959f730f2453bf9a295158749b96ed3a966ef4
(cherry picked from commit b9205e8)
  • Loading branch information
Jesse Pretorius committed Nov 28, 2017
1 parent f827e93 commit 3779124
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 27 deletions.
1 change: 1 addition & 0 deletions tasks/main.yml
Expand Up @@ -58,6 +58,7 @@
- include: rabbitmq_set_cookie.yml
tags:
- rabbitmq_server-config
- rabbitmq-config

- include: rabbitmq_post_install.yml
tags:
Expand Down
43 changes: 16 additions & 27 deletions tasks/rabbitmq_set_cookie.yml
Expand Up @@ -13,33 +13,22 @@
# See the License for the specific language governing permissions and
# limitations under the License.

- block:
- name: Read rabbit cookie
slurp:
src: /var/lib/rabbitmq/.erlang.cookie
register: tmp_rabbit_cookie
failed_when: (tmp_rabbit_cookie.content | b64decode).find(rabbitmq_cookie_token) == -1
tags:
- rabbitmq-config
- name: Set rabbit cookie
copy:
content: "{{ rabbitmq_cookie_token }}"
dest: /var/lib/rabbitmq/.erlang.cookie
mode: "0400"
owner: rabbitmq
group: rabbitmq
register: cookie_set

rescue:
- include: rabbitmq_stopped.yml
static: no
tags:
- rabbitmq-config
- include: rabbitmq_stopped.yml
static: no
when:
- cookie_set | changed

- name: Set rabbit cookie
copy:
content: "{{ rabbitmq_cookie_token }}"
dest: /var/lib/rabbitmq/.erlang.cookie
mode: "0400"
owner: rabbitmq
group: rabbitmq
register: cookie_set
tags:
- rabbitmq-config
- include: rabbitmq_started.yml
static: no
when:
- cookie_set | changed

- include: rabbitmq_started.yml
static: no
tags:
- rabbitmq-config

0 comments on commit 3779124

Please sign in to comment.