]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-cm-ansible.git/commitdiff
container-host: quick improvement in container_mirror code 596/head
authorGuillaume Abrioux <gabrioux@redhat.com>
Mon, 7 Dec 2020 13:57:50 +0000 (14:57 +0100)
committerGuillaume Abrioux <gabrioux@redhat.com>
Mon, 7 Dec 2020 14:01:59 +0000 (15:01 +0100)
Let's get rid of these consecutives `set_fact`.
We can inject `PATH` variable on the task calling `registries-conf-ctl`
instead.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
roles/container-host/tasks/container_mirror.yml

index 5f2a003fe732fa9986d171076fe0ca3f96a491a8..5bc0c125184057db93c2f02271c4dbec29b2c62d 100644 (file)
     name: git+https://github.com/sebastian-philipp/registries-conf-ctl
     state: latest
 
-# Why is this even necessary?  I couldn't figure this out.  I'd pip install but the command was not found in the next task.  Tried '--user', umask: 0022, shell and command modules.
-- name: Find registries-conf-ctl
-  stat:
-    path: /usr/bin/registries-conf-ctl
-  register: usr_bin_rcc
-
-- name: Find registries-conf-ctl again
-  stat:
-    path: /usr/local/bin/registries-conf-ctl
-  register: usr_local_bin_rcc
-
-- set_fact:
-    rcc_path: /usr/bin/registries-conf-ctl
-  when: usr_bin_rcc.stat.exists
-
-- set_fact:
-    rcc_path: /usr/local/bin/registries-conf-ctl
-  when: usr_local_bin_rcc.stat.exists
-
 - name: "Check for docker's daemon.json"
   stat:
     path: "{{ container_service_conf }}"
@@ -51,4 +32,6 @@
     - container_conf.stat.exists == False
 
 - name: Add local docker.io registry mirror
-  command: "{{ rcc_path }} add-mirror docker.io {{ container_mirror }}"
+  command: registries-conf-ctl add-mirror docker.io "{{ container_mirror }}"
+  environment:
+    PATH: /usr/local/bin:/usr/bin