Browse Source

Fix mixup http/https in bootstrap-debian.yml (#3963)

* Fix mixup http/https in bootstrap-debian.yml

* Update bootstrap-debian.yml
pull/3969/head
Anton Patsev 5 years ago
committed by Kubernetes Prow Robot
parent
commit
e25237455c
1 changed files with 5 additions and 5 deletions
  1. 10
      roles/bootstrap-os/tasks/bootstrap-debian.yml

10
roles/bootstrap-os/tasks/bootstrap-debian.yml

@ -14,7 +14,7 @@
tags: facts tags: facts
- name: Check http::proxy in /etc/apt/apt.conf - name: Check http::proxy in /etc/apt/apt.conf
raw: grep -qs 'Acquire::http::proxy' /etc/apt/apt.conf
raw: grep -qsi 'Acquire::http::Proxy' /etc/apt/apt.conf
register: need_http_proxy register: need_http_proxy
failed_when: false failed_when: false
changed_when: false changed_when: false
@ -22,14 +22,14 @@
tags: facts tags: facts
- name: Add http_proxy to /etc/apt/apt.conf if http_proxy is defined - 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
raw: echo 'Acquire::http::Proxy "{{http_proxy}}";' >> /etc/apt/apt.conf
environment: {} environment: {}
when: when:
- need_http_proxy.rc != 0 - need_http_proxy.rc != 0
- https_proxy is defined
- http_proxy is defined
- name: Check https::proxy in /etc/apt/apt.conf - name: Check https::proxy in /etc/apt/apt.conf
raw: grep -qs 'Acquire::https::proxy' /etc/apt/apt.conf
raw: grep -qsi 'Acquire::https::Proxy' /etc/apt/apt.conf
register: need_https_proxy register: need_https_proxy
failed_when: false failed_when: false
changed_when: false changed_when: false
@ -40,7 +40,7 @@
raw: echo 'Acquire::https::proxy "{{https_proxy}}";' >> /etc/apt/apt.conf raw: echo 'Acquire::https::proxy "{{https_proxy}}";' >> /etc/apt/apt.conf
environment: {} environment: {}
when: when:
- need_http_proxy.rc != 0
- need_https_proxy.rc != 0
- https_proxy is defined - https_proxy is defined
- name: Bootstrap | Install python 2.x, pip, and dbus - name: Bootstrap | Install python 2.x, pip, and dbus

Loading…
Cancel
Save