From 7753bfd408da700a686ee869cac8667e16bf5d98 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Mon, 7 May 2018 12:49:25 -0700
Subject: [PATCH] docker: add support for additional sockets

Add support to configure additional sockets with a new parameter (must
be an array):
container_registry_additional_sockets

Example of value:
container_registry_additional_sockets:
  - /var/lib/openstack/docker.sock
  - /var/run/some-other/docker.sock

Change-Id: I0da7f5f1005532b8ba68c46ed6ca065cc333d0d5
---
 defaults/main.yml | 1 +
 tasks/docker.yml  | 8 ++++++++
 vars/main.yml     | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index f4b8ab2..701600f 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -13,3 +13,4 @@ container_registry_port: 8787
 container_registry_mirror: ''
 container_registry_storage_options: '-s overlay2'
 container_registry_selinux: false
+container_registry_additional_sockets: []
diff --git a/tasks/docker.yml b/tasks/docker.yml
index 2ec48c6..0b1aca1 100644
--- a/tasks/docker.yml
+++ b/tasks/docker.yml
@@ -49,6 +49,14 @@
   vars:
     registry_flags: "{% for reg in container_registry_insecure_registries %}--insecure-registry {{ reg }}{% if not loop.last %} {% endif %}{% endfor %}"
 
+- name: Create additional socket directories
+  file:
+    path: "{{ item | dirname }}"
+    state: directory
+  notify: restart docker service
+  with_items: "{{ container_registry_additional_sockets }}"
+  when: container_registry_additional_sockets | length > 0
+
 - name: manage /etc/docker/daemon.json
   template:
     src: docker-daemon.json.j2
diff --git a/vars/main.yml b/vars/main.yml
index d42a30d..529eaca 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1 +1 @@
-_full_docker_options: "{% if container_registry_selinux|bool %}--selinux-enabled {% endif %}{{ container_registry_docker_options }}"
+_full_docker_options: "{% if container_registry_selinux|bool %}--selinux-enabled {% endif %}{% if container_registry_additional_sockets | length > 0 %}-H unix:///run/docker.sock {% for soc in container_registry_additional_sockets %}-H unix://{{ soc }}{% if not loop.last %} {% endif %}{% endfor %}{% endif %} {{ container_registry_docker_options }}"