C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #993 from code0x9/master

Browse source 
enable proxy support on docker repository
This commit is contained in:
Bogdan Dobrelya 2017-02-09 09:21:01 +01:00 committed by GitHub
commit 105dbf471e
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
roles/docker/tasks/main.yml
View file

@ -49,8 +49,8 @@
when: (not ansible_os_family in ["CoreOS", "Container Linux by CoreOS"]) and (docker_repo_info.repos|length > 0) when: (not ansible_os_family in ["CoreOS", "Container Linux by CoreOS"]) and (docker_repo_info.repos|length > 0)
- name: Configure docker repository on RedHat/CentOS - name: Configure docker repository on RedHat/CentOS
copy: template:
src: "rh_docker.repo" src: "rh_docker.repo.j2"
dest: "/etc/yum.repos.d/docker.repo" dest: "/etc/yum.repos.d/docker.repo"
when: ansible_distribution in ["CentOS","RedHat"] when: ansible_distribution in ["CentOS","RedHat"]

1
roles/docker/files/rh_docker.repo → roles/docker/templates/rh_docker.repo.j2
View file

@ -4,3 +4,4 @@ baseurl=https://yum.dockerproject.org/repo/main/centos/7
enabled=1 enabled=1
gpgcheck=1 gpgcheck=1
gpgkey=https://yum.dockerproject.org/gpg gpgkey=https://yum.dockerproject.org/gpg
{% if http_proxy is defined %}proxy={{ http_proxy }}{% endif %}