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

Update some docker defaults (#7499)

Browse source
This commit is contained in:
Florian Ruynat 2021-04-15 00:13:07 +02:00 committed by GitHub
parent b47c21c683
commit cd9a03f86c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
inventory/sample/group_vars/all/docker.yml
View file

@ -14,7 +14,8 @@ docker_container_storage_setup: false
## Valid options are systemd or cgroupfs, default is systemd ## Valid options are systemd or cgroupfs, default is systemd
# docker_cgroup_driver: systemd # docker_cgroup_driver: systemd
## Uncomment this if you have more than 3 nameservers, then we'll only use the first 3. ## Only set this if you have more than 3 nameservers:
## If true Kubespray will only use the first 3, otherwise it will fail
docker_dns_servers_strict: false docker_dns_servers_strict: false
# Path used to store Docker data # Path used to store Docker data
@ -32,7 +33,7 @@ docker_bin_dir: "/usr/bin"
# keep docker packages after installation; speeds up repeated ansible provisioning runs when '1' # 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 # kubespray deletes the docker package on each run, so caching the package makes sense
docker_rpm_keepcache: 0 docker_rpm_keepcache: 1
## 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.

4
roles/container-engine/docker/defaults/main.yml
View file

@ -13,10 +13,6 @@ docker_repo_info:
docker_cgroup_driver: systemd docker_cgroup_driver: systemd
docker_dns_servers_strict: true
docker_container_storage_setup: false
yum_repo_dir: /etc/yum.repos.d yum_repo_dir: /etc/yum.repos.d
# Fedora docker-ce repo # Fedora docker-ce repo

2
roles/container-engine/docker/tasks/set_facts_dns.yml
View file

@ -47,7 +47,7 @@
- name: check number of nameservers - name: check number of nameservers
fail: fail:
msg: "Too many nameservers. You can relax this check by set docker_dns_servers_strict=false in all.yml and we will only use the first 3." msg: "Too many nameservers. You can relax this check by set docker_dns_servers_strict=false in docker.yml and we will only use the first 3."
when: docker_dns_servers|length > 3 and docker_dns_servers_strict|bool when: docker_dns_servers|length > 3 and docker_dns_servers_strict|bool
- name: rtrim number of nameservers to 3 - name: rtrim number of nameservers to 3

3
roles/kubespray-defaults/defaults/main.yaml
View file

@ -265,7 +265,8 @@ docker_container_storage_setup: false
## Otherwise docker-storage-setup will be executed incorrectly. ## Otherwise docker-storage-setup will be executed incorrectly.
# docker_container_storage_setup_devs: /dev/vdb # docker_container_storage_setup_devs: /dev/vdb
## Uncomment this if you have more than 3 nameservers, then we'll only use the first 3. ## Only set this if you have more than 3 nameservers:
## If true Kubespray will only use the first 3, otherwise it will fail
docker_dns_servers_strict: false docker_dns_servers_strict: false
# Path used to store Docker data # Path used to store Docker data