Skip to content

Commit

Permalink
major: used full qualified collection names
Browse files Browse the repository at this point in the history
  • Loading branch information
tboerger committed Feb 6, 2024
1 parent ca951db commit 4597b3f
Show file tree
Hide file tree
Showing 7 changed files with 59 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/general.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
uses: actions/checkout@v4

- name: Role linting
uses: actionhippie/ansible-later@v2
uses: actionhippie/ansible-later@v3

testing:
runs-on: ubuntu-latest
Expand Down
4 changes: 2 additions & 2 deletions handlers/main.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
---
- name: Restart traefik
systemd:
ansible.builtin.systemd:
name: traefik
state: restarted
daemon_reload: True

- name: Reload traefik
systemd:
ansible.builtin.systemd:
name: traefik
state: '{{ "restarted" if traefik_force_restart else "reloaded" }}'
daemon_reload: True
Expand Down
8 changes: 8 additions & 0 deletions meta/requirements.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
collections:
- community.docker

roles:
- name: rolehippie.docker

...
44 changes: 35 additions & 9 deletions molecule/default/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,48 @@
gather_facts: False

tasks:
- name: Stat apt dir
register: aptdir
ansible.builtin.stat:
path: /var/lib/apt

- name: Wait for aptlock
shell: while fuser /var/lib/apt/lists/lock >/dev/null 2>&1; do echo 'Waiting for apt list lock.' && sleep 10; done
when: aptdir.stat.exists
changed_when: False
ansible.builtin.shell:
cmd: while fuser /var/lib/apt/lists/lock >/dev/null 2>&1; do echo 'Waiting for apt list lock.' && sleep 10; done

- name: Update package cache
apt:
when: aptdir.stat.exists
ansible.builtin.apt:
update_cache: True

- name: Install gpg dependency
apt:
name: python3-gpg
- name: Install test dependencies
when: aptdir.stat.exists
loop:
- python3-gpg
- curl
ansible.builtin.apt:
name: "{{ item }}"
state: present

- name: Install curl dependency
apt:
name: curl
state: present
- name: Create man dirs
changed_when: False
loop:
- /usr/share/man/man1
- /usr/share/man/man2
- /usr/share/man/man3
- /usr/share/man/man4
- /usr/share/man/man5
- /usr/share/man/man6
- /usr/share/man/man7
- /usr/share/man/man8
- /usr/share/man/man9
ansible.builtin.file:
path: "{{ item }}"
owner: root
group: root
mode: u=rwx,g=rx,o=rx
state: directory

...
4 changes: 3 additions & 1 deletion molecule/requirements.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
---
collections: []
collections:
- community.docker

roles:
- name: rolehippie.docker

Expand Down
16 changes: 8 additions & 8 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
- name: Create required dirs
with_items:
- /etc/traefik
file:
ansible.builtin.file:
path: "{{ item }}"
state: directory
owner: root
Expand All @@ -14,7 +14,7 @@
- name: Write general config
notify:
- Reload traefik
template:
ansible.builtin.template:
src: config.j2
dest: /etc/traefik/traefik.yml
owner: root
Expand All @@ -26,7 +26,7 @@
- name: Write static config
notify:
- Reload traefik
template:
ansible.builtin.template:
src: static.j2
dest: /etc/traefik/static.yml
owner: root
Expand All @@ -38,7 +38,7 @@
- name: Write env default
notify:
- Restart traefik
template:
ansible.builtin.template:
src: default.j2
dest: /etc/default/traefik
owner: root
Expand All @@ -50,7 +50,7 @@
- name: Write service file
notify:
- Restart traefik
template:
ansible.builtin.template:
src: service.j2
dest: /etc/systemd/system/traefik.service
owner: root
Expand All @@ -62,7 +62,7 @@
- name: Pull docker image
when:
- traefik_pull_image
docker_image:
community.docker.docker_image:
name: "{{ traefik_image }}"
source: pull
tags:
Expand All @@ -71,13 +71,13 @@
- name: Create docker network
when:
- traefik_network | default(False)
docker_network:
community.docker.docker_network:
name: '{{ traefik_network }}'
tags:
- traefik

- name: Start traefik service
systemd:
ansible.builtin.systemd:
name: traefik
state: started
daemon_reload: True
Expand Down
4 changes: 2 additions & 2 deletions templates/config.j2
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,15 @@ providers:
{% endif %}
defaultRule: {{ traefik_docker_default_rule }}

file:
ansible.builtin.file:
filename: /etc/traefik/static.yml
watch: true
{% if traefik_api_enabled %}

api:
insecure: {{ traefik_api_insecure | lower }}
dashboard: {{ traefik_api_dashboard | lower }}
debug: {{ traefik_api_debug | lower }}
ansible.builtin.debug: {{ traefik_api_debug | lower }}
{% endif %}
{% if traefik_prometheus_enabled %}

Expand Down

0 comments on commit 4597b3f

Please sign in to comment.