From 74a6efee3a6b44e1da859021c99b2007a84937fe Mon Sep 17 00:00:00 2001 From: Brad Cowie Date: Sun, 25 Aug 2024 18:44:29 +1200 Subject: [PATCH 1/6] Fix incorrect copyright statement in LICENSE file. --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index cc08bc1..f331e2a 100644 --- a/LICENSE +++ b/LICENSE @@ -187,7 +187,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2022 The University of Waikato, Hamilton, New Zealand. + Copyright 2024 Brad Cowie Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. From 190ec480555641710b52bb6b18290923e18e2350 Mon Sep 17 00:00:00 2001 From: Brad Cowie Date: Sun, 25 Aug 2024 18:44:42 +1200 Subject: [PATCH 2/6] Add sponsorship information. --- .github/FUNDING.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..5739302 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,3 @@ +--- +github: + - gizmoguy From 9a70709b6bb5670d22dc601c571b3543aedcd7c5 Mon Sep 17 00:00:00 2001 From: Brad Cowie Date: Sun, 25 Aug 2024 18:45:16 +1200 Subject: [PATCH 3/6] Change dependabot checks to weekly. --- .github/dependabot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 64284b9..23c4cb3 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,4 +4,4 @@ updates: - package-ecosystem: "github-actions" directory: "/" schedule: - interval: "monthly" + interval: "weekly" From 861b2ed2088ce9b7681426e5cd6da9722ca2282e Mon Sep 17 00:00:00 2001 From: Brad Cowie Date: Sun, 25 Aug 2024 18:46:05 +1200 Subject: [PATCH 4/6] Update list of supported platforms. --- meta/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/main.yml b/meta/main.yml index 9f421b2..f0d6385 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -14,10 +14,12 @@ galaxy_info: versions: - bullseye - bookworm + - trixie - name: Ubuntu versions: - focal - jammy + - noble galaxy_tags: [] From 1619586c54e8b3a0fb2650b780fe3a64f0be0153 Mon Sep 17 00:00:00 2001 From: Brad Cowie Date: Sun, 25 Aug 2024 18:53:48 +1200 Subject: [PATCH 5/6] Separate requirements and test requirements. --- .github/workflows/lint.yml | 2 ++ .github/workflows/test.yml | 2 ++ README.md | 6 ++++++ requirements.txt | 3 +++ test-requirements.txt | 3 --- 5 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 requirements.txt diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index c07813f..7bb6b9c 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -15,6 +15,8 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 0 + - name: Install dependencies + run: pip3 install -r requirements.txt - name: Lint ansible uses: wandansible/action-ansible-lint@v1 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5b978d8..050ee74 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -33,6 +33,8 @@ jobs: uses: actions/setup-python@v5 with: python-version: '3.x' + - name: Install dependencies + run: pip3 install -r requirements.txt - name: Install test dependencies run: pip3 install -r test-requirements.txt - name: Run molecule diff --git a/README.md b/README.md index 8cc70d8..4aca4d5 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,12 @@ Checks include: * Ansible playbook directory is checked out from the right git branch and there are no local changes in the git working tree. +Requirements +------------ + +To use this role, the python packages `netaddr`, `jmespath` and `passlib` +must be installed on the host running ansible. + Role Variables -------------- diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..68fe6b1 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,3 @@ +jmespath +passlib +netaddr diff --git a/test-requirements.txt b/test-requirements.txt index 5b92c1c..39779a8 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,6 +1,3 @@ ansible -jmespath -passlib -netaddr molecule molecule-plugins[docker] From 649a2f8b9c5fe3b7c90fd6f82b908f1bd7595ae1 Mon Sep 17 00:00:00 2001 From: Brad Cowie Date: Sun, 25 Aug 2024 18:54:06 +1200 Subject: [PATCH 6/6] Delint. --- .github/workflows/lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 7bb6b9c..efff3a8 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -24,7 +24,7 @@ jobs: name: Jinja2 Lint runs-on: ubuntu-latest env: - J2LINT_FILES_REGEX: '^templates/.+$' + J2LINT_FILES_REGEX: "^templates/.+$" steps: - name: Checkout repo uses: actions/checkout@v4