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/tasks/systemcontainer_crio.yml | 5 +++++
roles/container_runtime/templates/crio-network.j2 | 9 +++++++++
2 files changed, 14 insertions(+)
create mode 100644 roles/container_runtime/templates/crio-network.j2
(limited to 'roles/container_runtime')
diff --git a/roles/container_runtime/tasks/systemcontainer_crio.yml b/roles/container_runtime/tasks/systemcontainer_crio.yml
index 6a195a938..30d233f5c 100644
--- a/roles/container_runtime/tasks/systemcontainer_crio.yml
+++ b/roles/container_runtime/tasks/systemcontainer_crio.yml
@@ -81,6 +81,11 @@
dest: /etc/cni/net.d/openshift-sdn.conf
src: 80-openshift-sdn.conf.j2
+- name: Create /etc/sysconfig/crio-network
+ template:
+ dest: /etc/sysconfig/crio-network
+ src: crio-network.j2
+
- name: Start the CRI-O service
systemd:
name: "cri-o"
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
From 3e5a8a1b3c545c3050924fc70f105b3c23e7dce7 Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Fri, 5 Jan 2018 10:07:54 +0100
Subject: crio: create /etc/sysconfig/crio-storage
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
---
roles/container_runtime/tasks/systemcontainer_crio.yml | 6 ++++++
1 file changed, 6 insertions(+)
(limited to 'roles/container_runtime')
diff --git a/roles/container_runtime/tasks/systemcontainer_crio.yml b/roles/container_runtime/tasks/systemcontainer_crio.yml
index 30d233f5c..eedb18604 100644
--- a/roles/container_runtime/tasks/systemcontainer_crio.yml
+++ b/roles/container_runtime/tasks/systemcontainer_crio.yml
@@ -81,6 +81,12 @@
dest: /etc/cni/net.d/openshift-sdn.conf
src: 80-openshift-sdn.conf.j2
+- name: Create /etc/sysconfig/crio-storage
+ copy:
+ content: ""
+ dest: /etc/sysconfig/crio-storage
+ force: no
+
- name: Create /etc/sysconfig/crio-network
template:
dest: /etc/sysconfig/crio-network
--
cgit v1.2.3