airship
/
airshipctl
Code Issues Proposed changes

AIAP: Cascade environment variables to playbooks 

Change-Id: Icb6a636d1af80c6097667f3fc69131ed3b6a0299
This commit is contained in:
Ian Howell 2021-08-04 14:04:43 -05:00
parent 5be95e2e82
commit 36d7153a66
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/airship-in-a-pod/infra-builder/assets/opt/ansible/playbooks/roles/install-kustomize/defaults/main.yml → tools/airship-in-a-pod/infra-builder/assets/opt/ansible/playbooks/roles/install-kustomize/defaults/main.yaml
View File

@ -13,5 +13,6 @@
kustomize_version: v3.8.5 kustomize_version: v3.8.5
kustomize_download_url: "https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/{{ kustomize_version }}/kustomize_{{ kustomize_version }}_linux_amd64.tar.gz" kustomize_download_url: "https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/{{ kustomize_version }}/kustomize_{{ kustomize_version }}_linux_amd64.tar.gz"
proxy: proxy:
http: http_proxy: "{{ lookup('env', 'http_proxy') }}"
noproxy: https_proxy: "{{ lookup('env', 'https_proxy') }}"
no_proxy: "{{ lookup('env', 'no_proxy') }}"

6
tools/airship-in-a-pod/infra-builder/assets/opt/ansible/playbooks/roles/install-kustomize/tasks/main.yaml
View File

@ -19,6 +19,6 @@
args: args:
warn: false warn: false
environment: environment:
http_proxy: "{{ proxy.http }}" http_proxy: "{{ proxy.http_proxy }}"
https_proxy: "{{ proxy.http }}" https_proxy: "{{ proxy.https_proxy }}"
no_proxy: "{{ proxy.noproxy }}" no_proxy: "{{ proxy.no_proxy }}"