From 5c6af565bfae851b493c8b4670d56f69016de3bb Mon Sep 17 00:00:00 2001
From: Kenny Woodson <kwoodson@redhat.com>
Date: Tue, 19 Dec 2017 11:02:28 -0500
Subject: Adding support for docker-storage-setup on overlay

---
 roles/container_runtime/templates/docker_storage_setup.j2 | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 roles/container_runtime/templates/docker_storage_setup.j2

(limited to 'roles/container_runtime/templates')

diff --git a/roles/container_runtime/templates/docker_storage_setup.j2 b/roles/container_runtime/templates/docker_storage_setup.j2
new file mode 100644
index 000000000..b056087e0
--- /dev/null
+++ b/roles/container_runtime/templates/docker_storage_setup.j2
@@ -0,0 +1,12 @@
+# Edit this file to override any configuration options specified in
+# /usr/lib/docker-storage-setup/docker-storage-setup.
+#
+# For more details refer to "man docker-storage-setup"
+DEVS={{ container_runtime_docker_storage_setup_device }}
+VG={{ docker_storage_setup_options.vg }}
+DATA_SIZE={{ docker_storage_setup_options.data_size }}
+STORAGE_DRIVER="{{ docker_storage_setup_options.storage_driver }}"
+CONTAINER_ROOT_LV_NAME="{{ docker_storage_setup_options.root_lv_name }}"
+CONTAINER_ROOT_LV_SIZE="{{ docker_storage_setup_options.root_lv_size }}"
+CONTAINER_ROOT_LV_MOUNT_PATH="{{ docker_storage_setup_options.root_lv_mount_path }}"
+EXTRA_STORAGE_OPTIONS="{{ docker_storage_extra_options | join(' ') }}"
-- 
cgit v1.2.3


From 98eef4c6f0ff07c4812c7d15b5cf678c356f48c4 Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Fri, 5 Jan 2018 10:07:35 +0100
Subject: crio: configure proxy variables

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1529478

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
---
 roles/container_runtime/templates/crio-network.j2 | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 roles/container_runtime/templates/crio-network.j2

(limited to 'roles/container_runtime/templates')

diff --git a/roles/container_runtime/templates/crio-network.j2 b/roles/container_runtime/templates/crio-network.j2
new file mode 100644
index 000000000..763be97d7
--- /dev/null
+++ b/roles/container_runtime/templates/crio-network.j2
@@ -0,0 +1,9 @@
+{% if 'http_proxy' in openshift.common %}
+HTTP_PROXY={{ openshift.common.http_proxy }}
+{% endif %}
+{% if 'https_proxy' in openshift.common %}
+HTTPS_PROXY={{ openshift.common.https_proxy }}
+{% endif %}
+{% if 'no_proxy' in openshift.common %}
+NO_PROXY={{ openshift.common.no_proxy }}
+{% endif %}
-- 
cgit v1.2.3