From b6bab5b9318de460bb95b3cecf4e7162cae3fe6b Mon Sep 17 00:00:00 2001
From: Kevin Tibi <kevintibi@hotmail.com>
Date: Mon, 28 May 2018 11:06:45 +0200
Subject: [PATCH] Add custom option for docker

Some options can't be add in the daemon.json
The only way to configure daemon is to add option in the service file

Change-Id: I88697951ed6518f62bca30bb52288ad0e487ec03
---
 ansible/roles/baremetal/defaults/main.yml                    | 2 ++
 ansible/roles/baremetal/templates/docker_systemd_service.j2  | 2 +-
 .../notes/custom_option_docker-f5b810a8edce06fa.yaml         | 5 +++++
 3 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/custom_option_docker-f5b810a8edce06fa.yaml

diff --git a/ansible/roles/baremetal/defaults/main.yml b/ansible/roles/baremetal/defaults/main.yml
index 02607f8481..9548acc227 100644
--- a/ansible/roles/baremetal/defaults/main.yml
+++ b/ansible/roles/baremetal/defaults/main.yml
@@ -21,6 +21,8 @@ selinux_state: "permissive"
 
 docker_storage_driver: ""
 
+docker_custom_option: ""
+
 docker_runtime_directory: ""
 
 debian_pkg_install:
diff --git a/ansible/roles/baremetal/templates/docker_systemd_service.j2 b/ansible/roles/baremetal/templates/docker_systemd_service.j2
index 4b0b76bcd8..e9b89384c3 100644
--- a/ansible/roles/baremetal/templates/docker_systemd_service.j2
+++ b/ansible/roles/baremetal/templates/docker_systemd_service.j2
@@ -1,4 +1,4 @@
 [Service]
 MountFlags=shared
 ExecStart=
-ExecStart=/usr/bin/{{ docker_binary_name|default("docker daemon", true) }}{% if docker_registry %} --insecure-registry {{ docker_registry }}{% endif %}{% if docker_storage_driver %} --storage-driver {{ docker_storage_driver }}{% endif %}{% if docker_runtime_directory %} --graph {{ docker_runtime_directory }}{% endif %}
+ExecStart=/usr/bin/{{ docker_binary_name|default("docker daemon", true) }}{% if docker_registry %} --insecure-registry {{ docker_registry }}{% endif %}{% if docker_storage_driver %} --storage-driver {{ docker_storage_driver }}{% endif %}{% if docker_runtime_directory %} --graph {{ docker_runtime_directory }}{% endif %}{% if docker_custom_option %} {{ docker_custom_option }}{% endif %}
diff --git a/releasenotes/notes/custom_option_docker-f5b810a8edce06fa.yaml b/releasenotes/notes/custom_option_docker-f5b810a8edce06fa.yaml
new file mode 100644
index 0000000000..62d4a1d6d6
--- /dev/null
+++ b/releasenotes/notes/custom_option_docker-f5b810a8edce06fa.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Add custom option for docker daemon by configure the docker service. An operator
+    named "docker_custom_option" will be added.