added rpm caching for to docker repo (#3718)

pull/3728/head
Johnny Halfmoon 2018-11-16 11:33:23 +01:00 committed by k8s-ci-robot
parent 5ba67c55a2
commit 618ab93b42
3 changed files with 6 additions and 1 deletions

View File

@ -25,6 +25,10 @@ docker_log_opts: "--log-opt max-size=50m --log-opt max-file=5"
# define docker bin_dir # define docker bin_dir
docker_bin_dir: "/usr/bin" docker_bin_dir: "/usr/bin"
# keep docker packages after installation; speeds up repeated ansible provisioning runs when '1'
# kubespray deletes the docker package on each run, so caching the package makes sense
docker_rpm_keepcache: 0
## An obvious use case is allowing insecure-registry access to self hosted registries. ## An obvious use case is allowing insecure-registry access to self hosted registries.
## Can be ipaddress and domain_name. ## Can be ipaddress and domain_name.
## example define 172.19.16.11 or mirror.registry.io ## example define 172.19.16.11 or mirror.registry.io

View File

@ -124,7 +124,6 @@
line: 'obsoletes=0' line: 'obsoletes=0'
when: ansible_distribution in ["CentOS","RedHat"] and not is_atomic when: ansible_distribution in ["CentOS","RedHat"] and not is_atomic
- name: ensure docker packages are installed - name: ensure docker packages are installed
action: "{{ docker_package_info.pkg_mgr }}" action: "{{ docker_package_info.pkg_mgr }}"
args: args:

View File

@ -3,6 +3,7 @@ name=Docker-CE Repository
baseurl={{ docker_rh_repo_base_url }} baseurl={{ docker_rh_repo_base_url }}
enabled=1 enabled=1
gpgcheck=1 gpgcheck=1
keepcache={{ docker_rpm_keepcache | default('1') }}
gpgkey={{ docker_rh_repo_gpgkey }} gpgkey={{ docker_rh_repo_gpgkey }}
{% if http_proxy is defined %}proxy={{ http_proxy }}{% endif %} {% if http_proxy is defined %}proxy={{ http_proxy }}{% endif %}
@ -11,5 +12,6 @@ name=Docker-Engine Repository
baseurl={{ dockerproject_rh_repo_base_url }} baseurl={{ dockerproject_rh_repo_base_url }}
enabled=1 enabled=1
gpgcheck=1 gpgcheck=1
keepcache={{ docker_rpm_keepcache | default('1') }}
gpgkey={{ dockerproject_rh_repo_gpgkey }} gpgkey={{ dockerproject_rh_repo_gpgkey }}
{% if http_proxy is defined %}proxy={{ http_proxy }}{% endif %} {% if http_proxy is defined %}proxy={{ http_proxy }}{% endif %}