diff --git a/app/playbooks/create.d/install-repos/create.yml b/app/playbooks/create.d/install-repos/create.yml index 2cc848a..e3a9461 100755 --- a/app/playbooks/create.d/install-repos/create.yml +++ b/app/playbooks/create.d/install-repos/create.yml @@ -38,6 +38,10 @@ rhcos_images_initramfs: "{{ lookup('ini', 'initramfs section=cluster file=/app/versions.ini') }}" rhcos_images_rootfs: "{{ lookup('ini', 'rootfs section=cluster file=/app/versions.ini') }}" rhcos_images_image: "{{ lookup('ini', 'image section=cluster file=/app/versions.ini') }}" + rhcos_images_http_proxy: "{{ proxy_http }}" + rhcos_images_https_proxy: "{{ proxy_https }}" + rhcos_images_noproxy: "{{ proxy_noproxy }}" + rhcos_images_https_validate: "{{ proxy_ca == '' }}" - name: create pxelinux kickstart files hosts: cluster diff --git a/app/roles/openshift-installer/tasks/main.yml b/app/roles/openshift-installer/tasks/main.yml index 3157156..baf71c2 100644 --- a/app/roles/openshift-installer/tasks/main.yml +++ b/app/roles/openshift-installer/tasks/main.yml @@ -10,6 +10,7 @@ dest: "{{ openshift_installer_dir }}/openshift-installer.tar.gz" mode: 0644 unsafe_writes: yes + validate_certs: "{{ openshift_installer_proxy_ca == '' }}" register: pkg_download - name: extract openshift installer diff --git a/app/roles/rhcos-images/defaults/main.yml b/app/roles/rhcos-images/defaults/main.yml index 7a7a1e9..7ce25c9 100644 --- a/app/roles/rhcos-images/defaults/main.yml +++ b/app/roles/rhcos-images/defaults/main.yml @@ -7,3 +7,7 @@ rhcos_images_image: "" rhcos_images_bootstrap_ign: "" rhcos_images_master_ign: "" rhcos_images_worker_ign: "" +rhcos_images_https_proxy: "" +rhcos_images_http_proxy: "" +rhcos_images_https_validate: True +rhcos_images_noproxy: "" diff --git a/app/roles/rhcos-images/tasks/main.yml b/app/roles/rhcos-images/tasks/main.yml index 51078dd..86986d7 100644 --- a/app/roles/rhcos-images/tasks/main.yml +++ b/app/roles/rhcos-images/tasks/main.yml @@ -8,6 +8,11 @@ uri: url: "{{ rhcos_images_repo }}/sha256sum.txt" return_content: yes + validate_certs: "{{ rhcos_images_https_validate }}" + environment: + HTTP_PROXY: "{{ rhcos_images_http_proxy }}" + HTTPS_PROXY: "{{ rhcos_images_https_proxy }}" + NO_PROXY: "{{ rhcos_images_noproxy }}" register: release_checksums changed_when: false @@ -31,6 +36,11 @@ dest: "{{ item.dest }}" checksum: "sha256:{{ item.checksum }}" mode: 0555 + validate_certs: "{{ rhcos_images_https_validate }}" + environment: + HTTP_PROXY: "{{ rhcos_images_http_proxy }}" + HTTPS_PROXY: "{{ rhcos_images_https_proxy }}" + NO_PROXY: "{{ rhcos_images_noproxy }}" loop: "{{ download_images }}" loop_control: label: "{{ item.dest }}"