Skip to content

Commit

Permalink
Merge pull request openshift#2266 from shiftstack/bz/1873556
Browse files Browse the repository at this point in the history
Bug 1873556: [on-prem] inject the proxy into the env for NetworkManager.service
  • Loading branch information
openshift-merge-robot authored Dec 2, 2020
2 parents be1ad78 + f41b1d2 commit 824ddee
Showing 1 changed file with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ contents:
{{if .Proxy -}}
{{if .Proxy.HTTPProxy -}}
HTTP_PROXY={{.Proxy.HTTPProxy}}
export HTTP_PROXY={{.Proxy.HTTPProxy}}
{{end -}}
{{if .Proxy.HTTPSProxy -}}
HTTPS_PROXY={{.Proxy.HTTPSProxy}}
export HTTPS_PROXY={{.Proxy.HTTPSProxy}}
{{end -}}
{{if .Proxy.NoProxy -}}
NO_PROXY={{.Proxy.NoProxy}}
export NO_PROXY={{.Proxy.NoProxy}}
{{end -}}
{{end -}}
Expand Down Expand Up @@ -64,4 +64,4 @@ contents:
*)
;;
esac
{{ end -}}
{{ end -}}

0 comments on commit 824ddee

Please sign in to comment.