Merge "Add proxy to systemwide-executable roles"

2020-03-06 20:25:51 +00:00 · 2020-03-06 20:25:51 +00:00 · 8c6ef23228
commit 8c6ef23228
parent e3d718137c 7d9d765fbc
2 changed files with 8 additions and 0 deletions
--- a/roles/airshipctl-systemwide-executable/defaults/main.yaml
+++ b/roles/airshipctl-systemwide-executable/defaults/main.yaml
@ -0,0 +1,4 @@
+proxy:
+  enabled: "false"
+  http:
+  noproxy:
--- a/roles/airshipctl-systemwide-executable/tasks/main.yaml
+++ b/roles/airshipctl-systemwide-executable/tasks/main.yaml
@ -2,6 +2,10 @@
  make:
    chdir: "{{ remote_work_dir | default(zuul.project.src_dir) }}"
    target: docker-image
+    params:
+      USE_PROXY: "{{ proxy.enabled }}"
+      PROXY: "{{ proxy.http }}"
+      NO_PROXY: "{{ proxy.noproxy }}"

 - name: "copy airshipctl binary to host"
  shell: |