Browse Source
Merge pull request #2844 from chechiachang/fix-inconsistent-variable-in-task-name-and-msg
Fix inconsistent variables in task name and task message
pull/2534/merge
Andreas Krüger
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
2 additions and
2 deletions
-
roles/docker/defaults/main.yml
-
roles/docker/tasks/set_facts_dns.yml
|
|
|
@ -17,7 +17,7 @@ dockerproject_repo_key_info: |
|
|
|
dockerproject_repo_info: |
|
|
|
repos: |
|
|
|
|
|
|
|
docker_dns_servers_strict: yes |
|
|
|
docker_dns_servers_strict: true |
|
|
|
|
|
|
|
docker_container_storage_setup: false |
|
|
|
|
|
|
|
|
|
|
|
@ -56,7 +56,7 @@ |
|
|
|
|
|
|
|
- name: check number of nameservers |
|
|
|
fail: |
|
|
|
msg: "Too many nameservers. You can relax this check by set docker_dns_servers_strict=no 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 all.yml and we will only use the first 3." |
|
|
|
when: docker_dns_servers|length > 3 and docker_dns_servers_strict|bool |
|
|
|
|
|
|
|
- name: rtrim number of nameservers to 3 |
|
|
|
|
