mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2026-02-14 17:50:06 -03:30
Resolve ansible-lint name errors (#10253)
* project: fix ansible-lint name Signed-off-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@proton.ch> * project: ignore jinja template error in names Signed-off-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@proton.ch> * project: capitalize ansible name Signed-off-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@proton.ch> * project: update notify after name capitalization Signed-off-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@proton.ch> --------- Signed-off-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@proton.ch>
This commit is contained in:
committed by
GitHub
parent
b9e3861385
commit
36e5d742dc
@@ -1,5 +1,5 @@
|
||||
---
|
||||
- name: restart docker
|
||||
- name: Restart docker
|
||||
command: /bin/true
|
||||
notify:
|
||||
- Docker | reload systemd
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
---
|
||||
- name: check if fedora coreos
|
||||
- name: Check if fedora coreos
|
||||
stat:
|
||||
path: /run/ostree-booted
|
||||
get_attributes: no
|
||||
@@ -7,18 +7,18 @@
|
||||
get_mime: no
|
||||
register: ostree
|
||||
|
||||
- name: set is_ostree
|
||||
- name: Set is_ostree
|
||||
set_fact:
|
||||
is_ostree: "{{ ostree.stat.exists }}"
|
||||
|
||||
- name: set docker_version for openEuler
|
||||
- name: Set docker_version for openEuler
|
||||
set_fact:
|
||||
docker_version: '19.03'
|
||||
when: ansible_distribution == "openEuler"
|
||||
tags:
|
||||
- facts
|
||||
|
||||
- name: gather os specific variables
|
||||
- name: Gather os specific variables
|
||||
include_vars: "{{ item }}"
|
||||
with_first_found:
|
||||
- files:
|
||||
@@ -44,14 +44,16 @@
|
||||
msg: "SUSE distributions always install Docker from the distro repos"
|
||||
when: ansible_pkg_mgr == 'zypper'
|
||||
|
||||
- include_tasks: set_facts_dns.yml
|
||||
- name: Gather DNS facts
|
||||
include_tasks: set_facts_dns.yml
|
||||
when: dns_mode != 'none' and resolvconf_mode == 'docker_dns'
|
||||
tags:
|
||||
- facts
|
||||
|
||||
- import_tasks: pre-upgrade.yml
|
||||
- name: Pre-upgrade docker
|
||||
import_tasks: pre-upgrade.yml
|
||||
|
||||
- name: ensure docker-ce repository public key is installed
|
||||
- name: Ensure docker-ce repository public key is installed
|
||||
apt_key:
|
||||
id: "{{ item }}"
|
||||
url: "{{ docker_repo_key_info.url }}"
|
||||
@@ -64,7 +66,7 @@
|
||||
environment: "{{ proxy_env }}"
|
||||
when: ansible_pkg_mgr == 'apt'
|
||||
|
||||
- name: ensure docker-ce repository is enabled
|
||||
- name: Ensure docker-ce repository is enabled
|
||||
apt_repository:
|
||||
repo: "{{ item }}"
|
||||
state: present
|
||||
@@ -99,7 +101,7 @@
|
||||
- docker-ce
|
||||
- docker-ce-cli
|
||||
|
||||
- name: ensure docker packages are installed
|
||||
- name: Ensure docker packages are installed
|
||||
package:
|
||||
name: "{{ docker_package_info.pkgs }}"
|
||||
state: "{{ docker_package_info.state | default('present') }}"
|
||||
@@ -117,7 +119,7 @@
|
||||
until: docker_task_result is succeeded
|
||||
retries: 4
|
||||
delay: "{{ retry_stagger | d(3) }}"
|
||||
notify: restart docker
|
||||
notify: Restart docker
|
||||
when:
|
||||
- not ansible_os_family in ["Flatcar", "Flatcar Container Linux by Kinvolk"]
|
||||
- not is_ostree
|
||||
@@ -135,9 +137,9 @@
|
||||
- docker-ce
|
||||
- docker-ce-cli
|
||||
|
||||
- name: ensure docker started, remove our config if docker start failed and try again
|
||||
- name: Ensure docker started, remove our config if docker start failed and try again
|
||||
block:
|
||||
- name: ensure service is started if docker packages are already present
|
||||
- name: Ensure service is started if docker packages are already present
|
||||
service:
|
||||
name: docker
|
||||
state: started
|
||||
@@ -145,7 +147,7 @@
|
||||
rescue:
|
||||
- debug: # noqa name[missing]
|
||||
msg: "Docker start failed. Try to remove our config"
|
||||
- name: remove kubespray generated config
|
||||
- name: Remove kubespray generated config
|
||||
file:
|
||||
path: "{{ item }}"
|
||||
state: absent
|
||||
@@ -154,13 +156,14 @@
|
||||
- /etc/systemd/system/docker.service.d/docker-options.conf
|
||||
- /etc/systemd/system/docker.service.d/docker-dns.conf
|
||||
- /etc/systemd/system/docker.service.d/docker-orphan-cleanup.conf
|
||||
notify: restart docker
|
||||
notify: Restart docker
|
||||
|
||||
- name: flush handlers so we can wait for docker to come up
|
||||
- name: Flush handlers so we can wait for docker to come up
|
||||
meta: flush_handlers
|
||||
|
||||
# Install each plugin using a looped include to make error handling in the included task simpler.
|
||||
- include_tasks: docker_plugin.yml
|
||||
- name: Install docker plugin
|
||||
include_tasks: docker_plugin.yml
|
||||
loop: "{{ docker_plugins }}"
|
||||
loop_control:
|
||||
loop_var: docker_plugin
|
||||
@@ -168,7 +171,7 @@
|
||||
- name: Set docker systemd config
|
||||
import_tasks: systemd.yml
|
||||
|
||||
- name: ensure docker service is started and enabled
|
||||
- name: Ensure docker service is started and enabled
|
||||
service:
|
||||
name: "{{ item }}"
|
||||
enabled: yes
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
ignore_errors: true # noqa ignore-errors
|
||||
when: docker_packages_list | length>0
|
||||
|
||||
- name: reset | remove all containers
|
||||
- name: Reset | remove all containers
|
||||
shell: "set -o pipefail && {{ docker_bin_dir }}/docker ps -aq | xargs -r docker rm -fv"
|
||||
args:
|
||||
executable: /bin/bash
|
||||
|
||||
@@ -1,23 +1,23 @@
|
||||
---
|
||||
|
||||
- name: set dns server for docker
|
||||
- name: Set dns server for docker
|
||||
set_fact:
|
||||
docker_dns_servers: "{{ dns_servers }}"
|
||||
|
||||
- name: show docker_dns_servers
|
||||
- name: Show docker_dns_servers
|
||||
debug:
|
||||
msg: "{{ docker_dns_servers }}"
|
||||
|
||||
- name: add upstream dns servers
|
||||
- name: Add upstream dns servers
|
||||
set_fact:
|
||||
docker_dns_servers: "{{ docker_dns_servers + upstream_dns_servers | default([]) }}"
|
||||
when: dns_mode in ['coredns', 'coredns_dual']
|
||||
|
||||
- name: add global searchdomains
|
||||
- name: Add global searchdomains
|
||||
set_fact:
|
||||
docker_dns_search_domains: "{{ docker_dns_search_domains + searchdomains | default([]) }}"
|
||||
|
||||
- name: check system nameservers
|
||||
- name: Check system nameservers
|
||||
shell: set -o pipefail && grep "^nameserver" /etc/resolv.conf | sed -r 's/^nameserver\s*([^#\s]+)\s*(#.*)?/\1/'
|
||||
args:
|
||||
executable: /bin/bash
|
||||
@@ -25,7 +25,7 @@
|
||||
register: system_nameservers
|
||||
check_mode: no
|
||||
|
||||
- name: check system search domains
|
||||
- name: Check system search domains
|
||||
# noqa risky-shell-pipe - if resolf.conf has no search domain, grep will exit 1 which would force us to add failed_when: false
|
||||
# Therefore -o pipefail is not applicable in this specific instance
|
||||
shell: grep "^search" /etc/resolv.conf | sed -r 's/^search\s*([^#]+)\s*(#.*)?/\1/'
|
||||
@@ -35,32 +35,32 @@
|
||||
register: system_search_domains
|
||||
check_mode: no
|
||||
|
||||
- name: add system nameservers to docker options
|
||||
- name: Add system nameservers to docker options
|
||||
set_fact:
|
||||
docker_dns_servers: "{{ docker_dns_servers | union(system_nameservers.stdout_lines) | unique }}"
|
||||
when: system_nameservers.stdout
|
||||
|
||||
- name: add system search domains to docker options
|
||||
- name: Add system search domains to docker options
|
||||
set_fact:
|
||||
docker_dns_search_domains: "{{ docker_dns_search_domains | union(system_search_domains.stdout.split() | default([])) | unique }}"
|
||||
when: system_search_domains.stdout
|
||||
|
||||
- name: check number of nameservers
|
||||
- name: Check number of nameservers
|
||||
fail:
|
||||
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
|
||||
|
||||
- name: rtrim number of nameservers to 3
|
||||
- name: Rtrim number of nameservers to 3
|
||||
set_fact:
|
||||
docker_dns_servers: "{{ docker_dns_servers[0:3] }}"
|
||||
when: docker_dns_servers | length > 3 and not docker_dns_servers_strict | bool
|
||||
|
||||
- name: check number of search domains
|
||||
- name: Check number of search domains
|
||||
fail:
|
||||
msg: "Too many search domains"
|
||||
when: docker_dns_search_domains | length > 6
|
||||
|
||||
- name: check length of search domains
|
||||
- name: Check length of search domains
|
||||
fail:
|
||||
msg: "Search domains exceeded limit of 256 characters"
|
||||
when: docker_dns_search_domains | join(' ') | length > 256
|
||||
|
||||
@@ -10,10 +10,10 @@
|
||||
src: http-proxy.conf.j2
|
||||
dest: /etc/systemd/system/docker.service.d/http-proxy.conf
|
||||
mode: 0644
|
||||
notify: restart docker
|
||||
notify: Restart docker
|
||||
when: http_proxy is defined or https_proxy is defined
|
||||
|
||||
- name: get systemd version
|
||||
- name: Get systemd version
|
||||
# noqa command-instead-of-module - systemctl is called intentionally here
|
||||
shell: set -o pipefail && systemctl --version | head -n 1 | cut -d " " -f 2
|
||||
args:
|
||||
@@ -29,7 +29,7 @@
|
||||
dest: /etc/systemd/system/docker.service
|
||||
mode: 0644
|
||||
register: docker_service_file
|
||||
notify: restart docker
|
||||
notify: Restart docker
|
||||
when:
|
||||
- not ansible_os_family in ["Flatcar", "Flatcar Container Linux by Kinvolk"]
|
||||
- not is_fedora_coreos
|
||||
@@ -39,14 +39,14 @@
|
||||
src: docker-options.conf.j2
|
||||
dest: "/etc/systemd/system/docker.service.d/docker-options.conf"
|
||||
mode: 0644
|
||||
notify: restart docker
|
||||
notify: Restart docker
|
||||
|
||||
- name: Write docker dns systemd drop-in
|
||||
template:
|
||||
src: docker-dns.conf.j2
|
||||
dest: "/etc/systemd/system/docker.service.d/docker-dns.conf"
|
||||
mode: 0644
|
||||
notify: restart docker
|
||||
notify: Restart docker
|
||||
when: dns_mode != 'none' and resolvconf_mode == 'docker_dns'
|
||||
|
||||
- name: Copy docker orphan clean up script to the node
|
||||
@@ -61,7 +61,7 @@
|
||||
src: docker-orphan-cleanup.conf.j2
|
||||
dest: "/etc/systemd/system/docker.service.d/docker-orphan-cleanup.conf"
|
||||
mode: 0644
|
||||
notify: restart docker
|
||||
notify: Restart docker
|
||||
when: docker_orphan_clean_up | bool
|
||||
|
||||
- name: Flush handlers
|
||||
|
||||
Reference in New Issue
Block a user