Fix linter issues
Some checks reported errors
continuous-integration/drone/push Build encountered an error

This commit is contained in:
Adrien Reslinger 2022-11-30 07:38:08 +01:00
parent eec95be2de
commit 43ebb7b044
Signed by: adrien
GPG key ID: DA7B27055C66D6DE
9 changed files with 33 additions and 23 deletions

View file

@ -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

View file

@ -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]

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -3,4 +3,4 @@ docker_packages_name:
- docker.io
docker_remove_packages_name:
- docker-engine
- docker-ce
- docker-ce

View file

@ -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
- python3-docker

View file

@ -1,5 +1,5 @@
---
docker_package_name:
docker_package_name:
- docker
docker_remove_packages_name:
- docker-ce

View file

@ -1,5 +1,5 @@
---
docker_package_name:
docker_package_name:
- docker-ce
- docker-ce-cli
- docker-compose-plugin