Fix linter issues
Some checks reported errors
continuous-integration/drone/push Build encountered an error
Some checks reported errors
continuous-integration/drone/push Build encountered an error
This commit is contained in:
parent
eec95be2de
commit
43ebb7b044
9 changed files with 33 additions and 23 deletions
|
|
@ -1,6 +1,10 @@
|
||||||
---
|
---
|
||||||
- name: Restart docker
|
- name: Restart docker
|
||||||
service: name=docker state=restarted
|
ansible.builtin.service:
|
||||||
|
name: docker
|
||||||
|
state: restarted
|
||||||
|
|
||||||
- name: reload ufw
|
- name: reload ufw
|
||||||
service: name=ufw state=reloaded
|
ansible.builtin.service:
|
||||||
|
name: ufw
|
||||||
|
state: reloaded
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,9 @@
|
||||||
ansible.builtin.copy:
|
ansible.builtin.copy:
|
||||||
src: etc/apt/keyrings/docker.gpg
|
src: etc/apt/keyrings/docker.gpg
|
||||||
dest: /etc/apt/keyrings/docker.gpg
|
dest: /etc/apt/keyrings/docker.gpg
|
||||||
|
group: root
|
||||||
|
owner: root
|
||||||
|
mode: 0644
|
||||||
when:
|
when:
|
||||||
- docker_ver == "docker_ce"
|
- docker_ver == "docker_ce"
|
||||||
|
|
||||||
|
|
@ -37,8 +40,8 @@
|
||||||
|
|
||||||
- name: Check whether ufw status is active
|
- name: Check whether ufw status is active
|
||||||
ansible.builtin.shell: ufw status
|
ansible.builtin.shell: ufw status
|
||||||
changed_when: False
|
changed_when: false
|
||||||
ignore_errors: True
|
ignore_errors: true
|
||||||
register: ufw_check
|
register: ufw_check
|
||||||
check_mode: false
|
check_mode: false
|
||||||
|
|
||||||
|
|
@ -47,7 +50,7 @@
|
||||||
dest: /etc/default/ufw
|
dest: /etc/default/ufw
|
||||||
regexp: '^(DEFAULT_FORWARD_POLICY=").*"$'
|
regexp: '^(DEFAULT_FORWARD_POLICY=").*"$'
|
||||||
line: '\1ACCEPT"'
|
line: '\1ACCEPT"'
|
||||||
backrefs: yes
|
backrefs: true
|
||||||
notify: reload ufw
|
notify: reload ufw
|
||||||
when: "'inactive' not in ufw_check.stdout"
|
when: "'inactive' not in ufw_check.stdout"
|
||||||
tags: [docker, firewall]
|
tags: [docker, firewall]
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
ansible.builtin.include_vars: "{{ ansible_os_family }}_{{ docker_ver }}.yml"
|
ansible.builtin.include_vars: "{{ ansible_os_family }}_{{ docker_ver }}.yml"
|
||||||
|
|
||||||
- name: See if docker is installed
|
- name: See if docker is installed
|
||||||
stat: path=/usr/bin/docker
|
ansible.builtin.stat: path=/usr/bin/docker
|
||||||
register: docker_installed
|
register: docker_installed
|
||||||
|
|
||||||
- name: Install docker rules for {{ ansible_os_family }} OS family
|
- name: Install docker rules for {{ ansible_os_family }} OS family
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
---
|
---
|
||||||
- name: Create ClusterSwarm group
|
- name: Create ClusterSwarm group
|
||||||
group_by: key=ClusterSwarm
|
ansible.builtin.group_by: key=ClusterSwarm
|
||||||
when:
|
when:
|
||||||
- docker_swarmmode
|
- docker_swarmmode
|
||||||
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
check_mode: false
|
check_mode: false
|
||||||
|
|
||||||
- name: Create Master Swarm group
|
- name: Create Master Swarm group
|
||||||
group_by: key=MasterSwarm
|
gansible.builtin.roup_by: key=MasterSwarm
|
||||||
when:
|
when:
|
||||||
- '"Swarm: active" in docker_info.stdout'
|
- '"Swarm: active" in docker_info.stdout'
|
||||||
- '" Is Manager: true" in docker_info.stdout'
|
- '" Is Manager: true" in docker_info.stdout'
|
||||||
|
|
@ -27,7 +27,7 @@
|
||||||
- inventory_hostname == groups['ClusterSwarm'][0]
|
- inventory_hostname == groups['ClusterSwarm'][0]
|
||||||
|
|
||||||
- name: Add the new master to MasterSwarm group
|
- name: Add the new master to MasterSwarm group
|
||||||
add_host:
|
ansible.builtin.add_host:
|
||||||
name: '{{ inventory_hostname }}'
|
name: '{{ inventory_hostname }}'
|
||||||
groups: MasterSwarm
|
groups: MasterSwarm
|
||||||
when:
|
when:
|
||||||
|
|
@ -111,7 +111,10 @@
|
||||||
# hosts: swarm-nodes
|
# hosts: swarm-nodes
|
||||||
# gather_facts: yes
|
# gather_facts: yes
|
||||||
# tasks:
|
# 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
|
## - name: Leave Swarm
|
||||||
## hosts: swarm-master:swarm-nodes
|
## hosts: swarm-master:swarm-nodes
|
||||||
|
|
|
||||||
|
|
@ -19,8 +19,8 @@
|
||||||
|
|
||||||
- name: Remove files and directories
|
- name: Remove files and directories
|
||||||
ansible.builtin.file:
|
ansible.builtin.file:
|
||||||
force: yes
|
force: true
|
||||||
recurse: yes
|
recurse: true
|
||||||
path: "{{ item }}"
|
path: "{{ item }}"
|
||||||
state: absent
|
state: absent
|
||||||
with_items:
|
with_items:
|
||||||
|
|
@ -31,7 +31,7 @@
|
||||||
|
|
||||||
- name: Register docker firewalld service
|
- name: Register docker firewalld service
|
||||||
ansible.builtin.file:
|
ansible.builtin.file:
|
||||||
force: yes
|
force: true
|
||||||
path: "/etc/firewalld/services/docker-swarm.xml"
|
path: "/etc/firewalld/services/docker-swarm.xml"
|
||||||
state: absent
|
state: absent
|
||||||
register: need_firewalld_reload
|
register: need_firewalld_reload
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue