diff options
| author | Scott Dodson <sdodson@redhat.com> | 2018-02-05 21:10:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-05 21:10:58 -0500 |
| commit | 4cb057694f0b07facb0f0ae53db9a62ddb5d094a (patch) | |
| tree | ce41f66901902c8095eb056968d60a669fa66c0e /roles | |
| parent | 57e1184d4e861ac319f4e85bc8c401ffa94db4b8 (diff) | |
| parent | 7ce6b62cfbdd4cde157ecc2154a43cf9e7afd56e (diff) | |
| download | openshift-4cb057694f0b07facb0f0ae53db9a62ddb5d094a.tar.gz openshift-4cb057694f0b07facb0f0ae53db9a62ddb5d094a.tar.bz2 openshift-4cb057694f0b07facb0f0ae53db9a62ddb5d094a.tar.xz openshift-4cb057694f0b07facb0f0ae53db9a62ddb5d094a.zip | |
Merge pull request #6933 from giuseppe/bz-1529478
cri-o: export variables defined in crio-network
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/container_runtime/templates/crio-network.j2 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/roles/container_runtime/templates/crio-network.j2 b/roles/container_runtime/templates/crio-network.j2 index 763be97d7..ae8a506fe 100644 --- a/roles/container_runtime/templates/crio-network.j2 +++ b/roles/container_runtime/templates/crio-network.j2 @@ -1,9 +1,9 @@ {% if 'http_proxy' in openshift.common %} -HTTP_PROXY={{ openshift.common.http_proxy }} +export HTTP_PROXY={{ openshift.common.http_proxy }} {% endif %} {% if 'https_proxy' in openshift.common %} -HTTPS_PROXY={{ openshift.common.https_proxy }} +export HTTPS_PROXY={{ openshift.common.https_proxy }} {% endif %} {% if 'no_proxy' in openshift.common %} -NO_PROXY={{ openshift.common.no_proxy }} +export NO_PROXY={{ openshift.common.no_proxy }} {% endif %} |