openstack/kayobe
Code Issues Proposed changes

Merge "Fix no_proxy configuration"

Browse Source
This commit is contained in:
Zuul 2022-04-26 15:58:20 +00:00 committed by Gerrit Code Review
commit f7d2f560fa
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ansible/group_vars/all/proxy
View File

@ -11,9 +11,11 @@ http_proxy: ""
https_proxy: "" https_proxy: ""
# List of domains, hostnames, IP addresses and networks for which no proxy is # List of domains, hostnames, IP addresses and networks for which no proxy is
# used. Defaults to ["127.0.0.1", "localhost", "{{ docker_registry }}"]. This # used. Defaults to ["127.0.0.1", "localhost", "{{ ('http://' ~
# is configured only if either http_proxy or https_proxy is set. # docker_registry) | urlsplit('hostname') }}"] if docker_registry is set, or
# ["127.0.0.1", "localhost"] otherwise. This is configured only if either
# http_proxy or https_proxy is set.
no_proxy: no_proxy:
- "127.0.0.1" - "127.0.0.1"
- "localhost" - "localhost"
- "{{ docker_registry }}" - "{{ ('http://' ~ docker_registry) | urlsplit('hostname') if docker_registry else '' }}"

8
ansible/proxy.yml
View File

@ -1,5 +1,5 @@
- name: Configure HTTP(S) proxy settings - name: Configure HTTP(S) proxy settings
hosts: seed-hypervisor:seed:overcloud hosts: seed-hypervisor:seed:overcloud:infra-vms
vars: vars:
ansible_python_interpreter: /usr/bin/python3 ansible_python_interpreter: /usr/bin/python3
tags: tags:
@ -14,7 +14,7 @@
regexp: "^http_proxy=.*" regexp: "^http_proxy=.*"
line: "http_proxy={{ http_proxy }}" line: "http_proxy={{ http_proxy }}"
become: True become: True
when: http_proxy is defined and http_proxy | length > 0 when: http_proxy | length > 0
- name: Add HTTPS proxy configuration to /etc/environment - name: Add HTTPS proxy configuration to /etc/environment
lineinfile: lineinfile:
@ -25,7 +25,7 @@
regexp: "^https_proxy=.*" regexp: "^https_proxy=.*"
line: "https_proxy={{ https_proxy }}" line: "https_proxy={{ https_proxy }}"
become: True become: True
when: https_proxy is defined and https_proxy | length > 0 when: https_proxy | length > 0
- name: Add no_proxy configuration to /etc/environment - name: Add no_proxy configuration to /etc/environment
lineinfile: lineinfile:
@ -38,4 +38,4 @@
become: True become: True
when: when:
- no_proxy | length > 0 - no_proxy | length > 0
- http_proxy is defined and http_proxy | length > 0 or https_proxy is defined and https_proxy | length > 0 - http_proxy | length > 0 or https_proxy | length > 0

6
etc/kayobe/proxy.yml
View File

@ -11,8 +11,10 @@
#https_proxy: #https_proxy:
# List of domains, hostnames, IP addresses and networks for which no proxy is # List of domains, hostnames, IP addresses and networks for which no proxy is
# used. Defaults to ["127.0.0.1", "localhost", "{{ docker_registry }}"]. This # used. Defaults to ["127.0.0.1", "localhost", "{{ ('http://' ~
# is configured only if either http_proxy or https_proxy is set. # docker_registry) | urlsplit('hostname') }}"] if docker_registry is set, or
# ["127.0.0.1", "localhost"] otherwise. This is configured only if either
# http_proxy or https_proxy is set.
#no_proxy: #no_proxy:
############################################################################### ###############################################################################