From df0ca83325c3f2724f99ca531bc9958e8eebadd1 Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Tue, 29 Jan 2019 13:08:16 -0700
Subject: [PATCH] Fix become for tasks and handlers

Some of our tasks and handlers need to be run as root but were
previously missing the become: true option. This change addresses this
to ensure the appropriate tasks and handlers are run as an admin user.

Change-Id: I9cf00809e8725d9220bc993c8fd6602e19ed7aa3
---
 handlers/main.yml             | 3 +++
 tasks/docker-distribution.yml | 3 +++
 tasks/docker.yml              | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/handlers/main.yml b/handlers/main.yml
index 60b9362..d0a1752 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -19,12 +19,14 @@
 - name: Docker | reload systemd
   systemd:
     daemon_reload: yes
+  become: true
   when: ansible_service_mgr == 'systemd'
 
 - name: Docker | reload docker
   service:
     name: docker
     state: restarted
+  become: true
 
 - name: Docker | pause while Docker restarts
   pause:
@@ -42,6 +44,7 @@
   service:
     name: docker-distribution
     state: restarted
+  become: true
 
 # NOTE(bogdando): import caveats https://github.com/ansible/ansible/issues/42621
 - name: Docker | wait for registry
diff --git a/tasks/docker-distribution.yml b/tasks/docker-distribution.yml
index a06047d..35b6138 100644
--- a/tasks/docker-distribution.yml
+++ b/tasks/docker-distribution.yml
@@ -4,11 +4,13 @@
   package:
     name: docker-distribution
     state: present
+  become: true
 
 - name: manage /etc/docker-distribution/registry/config.yml
   template:
     src: docker-distribution-config.yml.j2
     dest: /etc/docker-distribution/registry/config.yml
+  become: true
   notify: restart docker-distribution service
 
 - name: force systemd to reread configs
@@ -19,3 +21,4 @@
     enabled: true
     state: started
     name: docker-distribution
+  become: true
diff --git a/tasks/docker.yml b/tasks/docker.yml
index bc3c4c6..199f5c3 100644
--- a/tasks/docker.yml
+++ b/tasks/docker.yml
@@ -25,7 +25,6 @@
     # NOTE(aschultz): LP#1765121 - need to check that we don't have any ftype=0
     # volumes because other wise docker is very unhappy
     - name: Check if there are XFS volumes with ftype=0
-      become: true
       shell: |
         for dev in $(df -h | grep '/dev/' | grep -v 'tmp' | cut -d' ' -f1)
         do
@@ -148,4 +147,5 @@
         insertafter: "^# /etc/sysconfig/docker$"
         create: yes
 
+  become: true
   when: not container_registry_skip_reconfiguration or is_configured.rc != 0