diff --git a/.later.yml b/.later.yml deleted file mode 100644 index 2703cb9..0000000 --- a/.later.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -ansible: - custom_modules: - - iptables_raw - - openssl_pkcs12 - - proxmox_kvm - - ucr - - corenetworks_dns - - corenetworks_token - -rules: - exclude_files: - - "LICENSE*" - - "**/*.md" - - "**/*.ini" diff --git a/.woodpecker/docs.yaml b/.woodpecker/docs.yaml index f053ca8..857444b 100644 --- a/.woodpecker/docs.yaml +++ b/.woodpecker/docs.yaml @@ -9,11 +9,11 @@ steps: - name: generate image: quay.io/thegeeklab/ansible-doctor environment: - ANSIBLE_DOCTOR_EXCLUDE_FILES: molecule/ - ANSIBLE_DOCTOR_FORCE_OVERWRITE: "true" - ANSIBLE_DOCTOR_LOG_LEVEL: INFO - ANSIBLE_DOCTOR_ROLE_NAME: ${CI_REPO_NAME} - ANSIBLE_DOCTOR_TEMPLATE: readme + ANSIBLE_DOCTOR_EXCLUDE_FILES: "['molecule/']" + ANSIBLE_DOCTOR_RENDERER__FORCE_OVERWRITE: "true" + ANSIBLE_DOCTOR_LOGGING__LEVEL: info + ANSIBLE_DOCTOR_ROLE__NAME: ${CI_REPO_NAME} + ANSIBLE_DOCTOR_TEMPLATE__NAME: readme - name: format image: quay.io/thegeeklab/alpine-tools diff --git a/.woodpecker/lint.yaml b/.woodpecker/lint.yaml index 36b1ec8..59b112b 100644 --- a/.woodpecker/lint.yaml +++ b/.woodpecker/lint.yaml @@ -6,10 +6,10 @@ when: - ${CI_REPO_DEFAULT_BRANCH} steps: - - name: ansible-later - image: quay.io/thegeeklab/ansible-later:4 + - name: ansible-lint + image: ghcr.io/ansible/community-ansible-dev-tools commands: - - ansible-later + - ansible-lint environment: FORCE_COLOR: "1" diff --git a/.woodpecker/test.yaml b/.woodpecker/test.yaml index 256ad91..661dc8b 100644 --- a/.woodpecker/test.yaml +++ b/.woodpecker/test.yaml @@ -7,7 +7,7 @@ when: variables: - &molecule_base - image: quay.io/thegeeklab/molecule:6 + image: quay.io/thegeeklab/ansible-dev-tools:1 group: molecule environment: PY_COLORS: "1" diff --git a/meta/main.yml b/meta/main.yml index fe09833..6612f24 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -22,5 +22,3 @@ galaxy_info: - cacerts - corporate dependencies: [] -collections: - - community.general diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 8bbc57d..04f7bf0 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -8,7 +8,7 @@ dependency: requirements-file: molecule/requirements.yml platforms: - name: "rocky9-cacerts" - server_type: "CX22" + server_type: "cx22" image: "rocky-9" provisioner: name: ansible diff --git a/tasks/cacerts.yml b/tasks/cacerts.yml deleted file mode 100644 index 6ff1b0b..0000000 --- a/tasks/cacerts.yml +++ /dev/null @@ -1,28 +0,0 @@ ---- -- name: Install required packages - ansible.builtin.package: - name: "{{ item }}" - state: present - loop: "{{ cacerts_packages_extra + cacerts_packages }}" - -- name: Ensure ca path at '{{ __cacerts_ca_trust_source }}' exists - ansible.builtin.file: - path: "{{ __cacerts_ca_trust_source }}" - state: directory - mode: "0755" - -- name: Install custom ca certs - ansible.builtin.copy: - src: "{{ item.path }}" - dest: "{{ __cacerts_ca_trust_source }}/{{ item.name }}" - owner: root - group: root - mode: "0640" - register: __ca_add - loop: "{{ cacerts_ca_certs }}" - loop_control: - label: "{{ item.name }}" - -- name: Update cert index - ansible.builtin.command: "{{ __cacerts_ca_update_command }}" - changed_when: __ca_add.changed diff --git a/tasks/main.yml b/tasks/main.yml index c5f47df..7290866 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,5 +1,6 @@ --- -- ansible.builtin.include_vars: "{{ lookup('first_found', params) }}" +- name: Include OS specific vars + ansible.builtin.include_vars: "{{ lookup('first_found', params) }}" vars: params: files: @@ -9,4 +10,30 @@ - "vars" errors: "ignore" -- ansible.builtin.include_tasks: cacerts.yml +- name: Install required packages + ansible.builtin.package: + name: "{{ item }}" + state: present + loop: "{{ cacerts_packages_extra + cacerts_packages }}" + +- name: Ensure ca path exists '{{ __cacerts_ca_trust_source }}' + ansible.builtin.file: + path: "{{ __cacerts_ca_trust_source }}" + state: directory + mode: "0755" + +- name: Install custom ca certs + ansible.builtin.copy: + src: "{{ item.path }}" + dest: "{{ __cacerts_ca_trust_source }}/{{ item.name }}" + owner: root + group: root + mode: "0640" + register: __ca_add + loop: "{{ cacerts_ca_certs }}" + loop_control: + label: "{{ item.name }}" + +- name: Update cert index + ansible.builtin.command: "{{ __cacerts_ca_update_command }}" + changed_when: __ca_add.changed