From 43ebb7b044483c1f6db77975cb6140c3ff65aa78 Mon Sep 17 00:00:00 2001 From: Adrien Reslinger Date: Wed, 30 Nov 2022 07:38:08 +0100 Subject: [PATCH] Fix linter issues --- handlers/main.yml | 8 ++++++-- tasks/Debian.yml | 9 ++++++--- tasks/main.yml | 10 +++++----- tasks/swarm.yml | 13 ++++++++----- tasks/uninstall_RedHat.yml | 6 +++--- vars/Debian_docker.yml | 2 +- vars/Debian_docker_ce.yml | 4 ++-- vars/RedHat_docker.yml | 2 +- vars/RedHat_docker_ce.yml | 2 +- 9 files changed, 33 insertions(+), 23 deletions(-) diff --git a/handlers/main.yml b/handlers/main.yml index 6b5aab5..23c80eb 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -1,6 +1,10 @@ --- - name: Restart docker - service: name=docker state=restarted + ansible.builtin.service: + name: docker + state: restarted - name: reload ufw - service: name=ufw state=reloaded + ansible.builtin.service: + name: ufw + state: reloaded diff --git a/tasks/Debian.yml b/tasks/Debian.yml index e93a318..b25a8c5 100644 --- a/tasks/Debian.yml +++ b/tasks/Debian.yml @@ -9,6 +9,9 @@ ansible.builtin.copy: src: etc/apt/keyrings/docker.gpg dest: /etc/apt/keyrings/docker.gpg + group: root + owner: root + mode: 0644 when: - docker_ver == "docker_ce" @@ -37,8 +40,8 @@ - name: Check whether ufw status is active ansible.builtin.shell: ufw status - changed_when: False - ignore_errors: True + changed_when: false + ignore_errors: true register: ufw_check check_mode: false @@ -47,7 +50,7 @@ dest: /etc/default/ufw regexp: '^(DEFAULT_FORWARD_POLICY=").*"$' line: '\1ACCEPT"' - backrefs: yes + backrefs: true notify: reload ufw when: "'inactive' not in ufw_check.stdout" tags: [docker, firewall] diff --git a/tasks/main.yml b/tasks/main.yml index 9c0df53..4296d06 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -3,7 +3,7 @@ ansible.builtin.include_vars: "{{ ansible_os_family }}_{{ docker_ver }}.yml" - name: See if docker is installed - stat: path=/usr/bin/docker + ansible.builtin.stat: path=/usr/bin/docker register: docker_installed - name: Install docker rules for {{ ansible_os_family }} OS family @@ -53,13 +53,13 @@ # notify: Restart docker # - port TCP 2376: permet au client local de communiquer de façon sécurisée avec le daemon tournant sur une machine du swarm -# +# # - port TCP 2377: permet la communication entre les managers du swarm (port seulement ouvert sur les managers) -# +# # - port UDP 4789: permet la communication entre les containers sur un réseau overlay -# +# # - port TCP et UDP 7946: permet la communication entre les machines du swarm -# +# # - interfaces docker0 and docker_gwbridge ? firewall-cmd --change-zone=docker0 --zone=trusted --permanent; firewall-cmd --change-zone=docker_gwbridge --zone=trusted --permanent - name: Install python library for docker diff --git a/tasks/swarm.yml b/tasks/swarm.yml index a8906dd..c280cdb 100644 --- a/tasks/swarm.yml +++ b/tasks/swarm.yml @@ -1,6 +1,6 @@ --- - name: Create ClusterSwarm group - group_by: key=ClusterSwarm + ansible.builtin.group_by: key=ClusterSwarm when: - docker_swarmmode @@ -11,7 +11,7 @@ check_mode: false - name: Create Master Swarm group - group_by: key=MasterSwarm + gansible.builtin.roup_by: key=MasterSwarm when: - '"Swarm: active" in docker_info.stdout' - '" Is Manager: true" in docker_info.stdout' @@ -27,7 +27,7 @@ - inventory_hostname == groups['ClusterSwarm'][0] - name: Add the new master to MasterSwarm group - add_host: + ansible.builtin.add_host: name: '{{ inventory_hostname }}' groups: MasterSwarm when: @@ -96,7 +96,7 @@ # inventory_hostname in groups[docker_swarm_workers_ansible_group] and # 'Swarm: active' not in docker_info.stdout and # 'Swarm: pending' not in docker_info.stdout -# +# ############### # - name: Initialize Swarm Master # hosts: swarm-master @@ -111,7 +111,10 @@ # hosts: swarm-nodes # gather_facts: yes # tasks: -# - ansible.builtin.command: "docker swarm join --advertise-addr {{inventory_hostname}} --token {{hostvars[groups['swarm-master'][0]].swarmtoken}} {{hostvars[groups['swarm-master'][0]].inventory_hostname}}:2377" +# - ansible.builtin.command: > +# docker swarm join --advertise-addr {{inventory_hostname}} +# --token {{hostvars[groups['swarm-master'][0]].swarmtoken}} +# {{hostvars[groups['swarm-master'][0]].inventory_hostname}}:2377 # ## - name: Leave Swarm ## hosts: swarm-master:swarm-nodes diff --git a/tasks/uninstall_RedHat.yml b/tasks/uninstall_RedHat.yml index b35e92c..e4c6abd 100644 --- a/tasks/uninstall_RedHat.yml +++ b/tasks/uninstall_RedHat.yml @@ -19,8 +19,8 @@ - name: Remove files and directories ansible.builtin.file: - force: yes - recurse: yes + force: true + recurse: true path: "{{ item }}" state: absent with_items: @@ -31,7 +31,7 @@ - name: Register docker firewalld service ansible.builtin.file: - force: yes + force: true path: "/etc/firewalld/services/docker-swarm.xml" state: absent register: need_firewalld_reload diff --git a/vars/Debian_docker.yml b/vars/Debian_docker.yml index 3c0be4f..fe1ae08 100644 --- a/vars/Debian_docker.yml +++ b/vars/Debian_docker.yml @@ -3,4 +3,4 @@ docker_packages_name: - docker.io docker_remove_packages_name: - docker-engine - - docker-ce \ No newline at end of file + - docker-ce diff --git a/vars/Debian_docker_ce.yml b/vars/Debian_docker_ce.yml index abb2130..8fc4a88 100644 --- a/vars/Debian_docker_ce.yml +++ b/vars/Debian_docker_ce.yml @@ -1,5 +1,5 @@ --- -docker_package_name: +docker_package_name: - apt-transport-https - ca-certificates - curl @@ -10,4 +10,4 @@ docker_remove_packages_name: - docker-engine - docker.io docker_python_lib: - - python3-docker \ No newline at end of file + - python3-docker diff --git a/vars/RedHat_docker.yml b/vars/RedHat_docker.yml index c24bb31..0129cbf 100644 --- a/vars/RedHat_docker.yml +++ b/vars/RedHat_docker.yml @@ -1,5 +1,5 @@ --- -docker_package_name: +docker_package_name: - docker docker_remove_packages_name: - docker-ce diff --git a/vars/RedHat_docker_ce.yml b/vars/RedHat_docker_ce.yml index 30d41ef..c49f800 100644 --- a/vars/RedHat_docker_ce.yml +++ b/vars/RedHat_docker_ce.yml @@ -1,5 +1,5 @@ --- -docker_package_name: +docker_package_name: - docker-ce - docker-ce-cli - docker-compose-plugin