From 5f117fb65e869d7967c14de44fa3834e05aeda2d Mon Sep 17 00:00:00 2001
From: Anton Patsev <10828883+patsevanton@users.noreply.github.com>
Date: Wed, 26 Dec 2018 00:46:53 +0600
Subject: [PATCH] Add support http/https proxy for bootstrap-debian (#3932)
---
roles/bootstrap-os/tasks/bootstrap-debian.yml | 30 +++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/roles/bootstrap-os/tasks/bootstrap-debian.yml b/roles/bootstrap-os/tasks/bootstrap-debian.yml
index 07797cc55..ed43e89b4 100644
--- a/roles/bootstrap-os/tasks/bootstrap-debian.yml
+++ b/roles/bootstrap-os/tasks/bootstrap-debian.yml
@@ -13,6 +13,36 @@
environment: {}
tags: facts
+- name: Check http::proxy in /etc/apt/apt.conf
+ raw: grep -qs 'Acquire::http::proxy' /etc/apt/apt.conf
+ register: need_http_proxy
+ failed_when: false
+ changed_when: false
+ environment: {}
+ tags: facts
+
+- name: Add http_proxy to /etc/apt/apt.conf if http_proxy is defined
+ raw: echo 'Acquire::http::proxy "{{http_proxy}}";' >> /etc/apt/apt.conf
+ environment: {}
+ when:
+ - need_http_proxy.rc != 0
+ - https_proxy is defined
+
+- name: Check https::proxy in /etc/apt/apt.conf
+ raw: grep -qs 'Acquire::https::proxy' /etc/apt/apt.conf
+ register: need_https_proxy
+ failed_when: false
+ changed_when: false
+ environment: {}
+ tags: facts
+
+- name: Add https_proxy to /etc/apt/apt.conf if https_proxy is defined
+ raw: echo 'Acquire::https::proxy "{{https_proxy}}";' >> /etc/apt/apt.conf
+ environment: {}
+ when:
+ - need_http_proxy.rc != 0
+ - https_proxy is defined
+
- name: Bootstrap | Install python 2.x, pip, and dbus
raw:
apt-get update && \
--
GitLab