From 185d3387029d8664459ae67e32ede34b50b1ff2f Mon Sep 17 00:00:00 2001 From: Kumar Damani Date: Mon, 30 Jun 2025 15:12:19 -0400 Subject: refactoring tags in the roles --- ansible/roles/base/tasks/main.yaml | 17 +++--- ansible/roles/caddy_add/tasks/main.yaml | 97 ++++++++++++++++----------------- ansible/roles/docker/tasks/main.yaml | 53 +++++++++--------- ansible/roles/med_dl/tasks/main.yaml | 1 - 4 files changed, 79 insertions(+), 89 deletions(-) (limited to 'ansible') diff --git a/ansible/roles/base/tasks/main.yaml b/ansible/roles/base/tasks/main.yaml index b5aaf97..5252ced 100644 --- a/ansible/roles/base/tasks/main.yaml +++ b/ansible/roles/base/tasks/main.yaml @@ -1,12 +1,9 @@ --- -- tags: 'always' - # noqa: name[missing] - block: - - name: 'Install some useful packages' - ansible.builtin.apt: - name: - - 'tcpdump' - - 'curl' - state: 'present' - update_cache: true +- name: 'Install some useful packages' + ansible.builtin.apt: + name: + - 'tcpdump' + - 'curl' + state: 'present' + update_cache: true diff --git a/ansible/roles/caddy_add/tasks/main.yaml b/ansible/roles/caddy_add/tasks/main.yaml index cc93518..80dffaf 100644 --- a/ansible/roles/caddy_add/tasks/main.yaml +++ b/ansible/roles/caddy_add/tasks/main.yaml @@ -1,65 +1,62 @@ --- -- tags: 'always' - # noqa: name[missing] - block: - - name: 'Ensure required vars are set' - ansible.builtin.assert: - that: - - item | mandatory - loop: - - '{{ caddy_add_hosts }}' - - '{{ caddy_add_upstream_host }}' - - '{{ caddy_add_upstream_port }}' +- name: 'Ensure required vars are set' + ansible.builtin.assert: + that: + - item | mandatory + loop: + - '{{ caddy_add_hosts }}' + - '{{ caddy_add_upstream_host }}' + - '{{ caddy_add_upstream_port }}' - - name: 'Call the Caddy API to add our new host' - ansible.builtin.uri: - url: 'http://rproxy:2019/config/apps/http/servers/serv0/routes/0' - method: 'PUT' - body_format: 'json' - status_code: 200 - body: | +- name: 'Call the Caddy API to add our new host' + ansible.builtin.uri: + url: 'http://rproxy:2019/config/apps/http/servers/serv0/routes/0' + method: 'PUT' + body_format: 'json' + status_code: 200 + body: | + { + "match": [ { - "match": [ - { - "host": {{ caddy_add_hosts | to_json }} - } - ], - "handle": [ + "host": {{ caddy_add_hosts | to_json }} + } + ], + "handle": [ + { + "handler": "subroute", + "routes": [ { - "handler": "subroute", - "routes": [ + "handle": [ { - "handle": [ + "handler": "reverse_proxy", + "upstreams": [ { - "handler": "reverse_proxy", - "upstreams": [ - { - "dial": "{{ caddy_add_upstream_host }}:{{ caddy_add_upstream_port }}" - } - ] + "dial": "{{ caddy_add_upstream_host }}:{{ caddy_add_upstream_port }}" } ] } ] } - ], - "terminal": true + ] } + ], + "terminal": true + } - - name: 'Get a copy of the new Caddy config' - delegate_to: 'localhost' - ansible.builtin.uri: - url: 'http://rproxy:2019/config' - return_content: true - register: '_current_conf' +- name: 'Get a copy of the new Caddy config' + delegate_to: 'localhost' + ansible.builtin.uri: + url: 'http://rproxy:2019/config' + return_content: true + register: '_current_conf' - - name: 'Save the new config to file' - delegate_to: 'localhost' - when: 'not ansible_check_mode' - ansible.builtin.copy: - dest: 'artifacts/caddy/{{ _file_name }}' - content: '{{ _current_conf.json }}' - mode: '644' - vars: - _file_name: 'v{{ lookup("pipe", "date +%Y%m%dT%H%M%S") }}.json' +- name: 'Save the new config to file' + delegate_to: 'localhost' + when: 'not ansible_check_mode' + ansible.builtin.copy: + dest: 'artifacts/caddy/{{ _file_name }}' + content: '{{ _current_conf.json }}' + mode: '644' + vars: + _file_name: 'v{{ lookup("pipe", "date +%Y%m%dT%H%M%S") }}.json' diff --git a/ansible/roles/docker/tasks/main.yaml b/ansible/roles/docker/tasks/main.yaml index bb5b55b..7a0d753 100644 --- a/ansible/roles/docker/tasks/main.yaml +++ b/ansible/roles/docker/tasks/main.yaml @@ -1,34 +1,31 @@ --- -- tags: 'always' - # noqa: name[missing] - block: - - name: 'Install some prereqs' - ansible.builtin.package: - name: - - 'ca-certificates' - - 'gnupg' - state: 'present' +- name: 'Install some prereqs' + ansible.builtin.package: + name: + - 'ca-certificates' + - 'gnupg' + state: 'present' - - name: 'Run Docker installer' - ansible.builtin.shell: - cmd: | - curl -fsSL https://get.docker.com | sh - creates: '/var/run/docker.sock' +- name: 'Run Docker installer' + ansible.builtin.shell: + cmd: | + curl -fsSL https://get.docker.com | sh + creates: '/var/run/docker.sock' - - name: 'Docker set MTU' - ansible.builtin.copy: - dest: '/etc/docker/daemon.json' - content: | - {"mtu": 1420} - mode: '644' +- name: 'Docker set MTU' + ansible.builtin.copy: + dest: '/etc/docker/daemon.json' + content: | + {"mtu": 1420} + mode: '644' - - name: 'Restart Docker service' - ansible.builtin.service: - name: 'docker' - state: 'restarted' +- name: 'Restart Docker service' + ansible.builtin.service: + name: 'docker' + state: 'restarted' - - name: 'Install docker-compose' - ansible.builtin.package: - name: 'docker-compose' - state: 'present' +- name: 'Install docker-compose' + ansible.builtin.package: + name: 'docker-compose' + state: 'present' diff --git a/ansible/roles/med_dl/tasks/main.yaml b/ansible/roles/med_dl/tasks/main.yaml index c4d4a7f..8c28b2b 100644 --- a/ansible/roles/med_dl/tasks/main.yaml +++ b/ansible/roles/med_dl/tasks/main.yaml @@ -2,4 +2,3 @@ - name: 'Run the setup tasks' ansible.builtin.import_tasks: 'setup.yaml' - tags: 'med_dl' -- cgit v1.2.3