From 0cc18945c6e96caee6f658d98d7cf3033a1ceeb4 Mon Sep 17 00:00:00 2001 From: Sorin Sbarnea Date: Sat, 16 Feb 2019 10:42:20 +0000 Subject: [PATCH] Improve condition checking about docker registry config Avoids use of ignore_errors on a task that is only reading the status. We only use the result code (rc) of the check so the task iself should not fail regardless if the registry was managed or not. Improves output of ansible console and confusing false errors. Change-Id: I0be5f333a7ac6705279820a1a34667b4ec32f760 --- tasks/docker.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tasks/docker.yml b/tasks/docker.yml index eb0e58c..e4ee216 100644 --- a/tasks/docker.yml +++ b/tasks/docker.yml @@ -8,10 +8,13 @@ command: grep -Fq "# Configured by Ansible container registry role" /etc/sysconfig/docker register: is_configured check_mode: false - ignore_errors: true + failed_when: false changed_when: false -- block: +- name: configure docker registry block + when: not container_registry_skip_reconfiguration or is_configured.rc != 0 + become: true + block: # NOTE(aschultz): LP#1750194 - need to set ip_forward before docker starts # so lets set it before we install the package if we're managing it. - name: enable net.ipv4.ip_forward @@ -150,6 +153,3 @@ line: "# Configured by Ansible container registry role" insertafter: "^# /etc/sysconfig/docker$" create: yes - - become: true - when: not container_registry_skip_reconfiguration or is_configured.rc != 0