diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-05 07:34:52 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-05 07:34:52 -0800 |
| commit | 38fd87868572e1cd45b645896fc47b6577271df4 (patch) | |
| tree | f7074740e99dd7102122d610b9b5ccf9310baf45 | |
| parent | 9f19afc7529bd7293433b27e834b9ee3479e646f (diff) | |
| parent | 3e5a8a1b3c545c3050924fc70f105b3c23e7dce7 (diff) | |
| download | openshift-38fd87868572e1cd45b645896fc47b6577271df4.tar.gz openshift-38fd87868572e1cd45b645896fc47b6577271df4.tar.bz2 openshift-38fd87868572e1cd45b645896fc47b6577271df4.tar.xz openshift-38fd87868572e1cd45b645896fc47b6577271df4.zip | |
Merge pull request #6615 from giuseppe/cri-o-set-proxy
Automatic merge from submit-queue.
cri-o: set proxy variables
Make CRI-O honor HTTP_PROXY/HTTPS_PROXY/NO_PROXY.
This change https://github.com/kubernetes-incubator/cri-o/pull/1245 in the system container is required
| -rw-r--r-- | roles/container_runtime/tasks/systemcontainer_crio.yml | 11 | ||||
| -rw-r--r-- | roles/container_runtime/templates/crio-network.j2 | 9 |
2 files changed, 20 insertions, 0 deletions
diff --git a/roles/container_runtime/tasks/systemcontainer_crio.yml b/roles/container_runtime/tasks/systemcontainer_crio.yml index 6a195a938..eedb18604 100644 --- a/roles/container_runtime/tasks/systemcontainer_crio.yml +++ b/roles/container_runtime/tasks/systemcontainer_crio.yml @@ -81,6 +81,17 @@ 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 + 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 %} |