Skip to content

Commit 6b54a84

Browse files
authored
Merge pull request #69 from stackhpc/workflow-add-new-ansible
feat: add ansible `2.15` and `2.18` to test matrix
2 parents d75e16b + 9352dad commit 6b54a84

File tree

5 files changed

+26
-12
lines changed

5 files changed

+26
-12
lines changed

.ansible-lint

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@ skip_list:
66
- fqcn[action-core]
77
- fqcn[action]
88
- meta-no-info
9+
warn_list:
10+
- yaml[line-length]

.github/workflows/lint-collection.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ jobs:
66
lint:
77
uses: stackhpc/.github/.github/workflows/lint-collection.yml@main
88
with:
9-
lint_pip_dependencies: git+https://github.com/stackhpc/ansible-modules-hashivault@stackhpc
9+
lint_pip_dependencies: git+https://github.com/TerryHowe/ansible-modules-hashivault@c22434d887f0b8a5ac3ebda710664a027291e71c

.github/workflows/pull_request.yml

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,33 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
ansible:
17-
- "2.12"
16+
ansible_version:
17+
- "2.15"
18+
- "2.18"
19+
python_version:
20+
- "3.9"
21+
- "3.11"
22+
exclude:
23+
- python_version: "3.9"
24+
ansible_version: "2.18"
1825
steps:
19-
# Checks-out the repository under $GITHUB_WORKSPACE, so it's accessible to the job
20-
- uses: actions/checkout@v3
26+
- name: Github Checkout 🛎
27+
uses: actions/checkout@v4
2128

22-
- name: Install dependencies
29+
- name: Setup Python ${{ matrix.python_version }} 🐍
30+
uses: actions/setup-python@v5
31+
with:
32+
python-version: ${{ matrix.python_version }}
33+
34+
- name: Install dependencies 📦
2335
run: |
2436
pipx uninstall ansible-core
2537
python3 -m pip install --upgrade pip
26-
python3 -m pip install ansible-core==${{ matrix.ansible }}.* docker git+https://github.com/stackhpc/ansible-modules-hashivault@stackhpc
38+
python3 -m pip install ansible-core==${{ matrix.ansible_version }}.* docker git+https://github.com/TerryHowe/ansible-modules-hashivault@c22434d887f0b8a5ac3ebda710664a027291e71c
2739
ansible-galaxy collection build
2840
ansible-galaxy collection install *.tar.gz
41+
ansible-galaxy collection install community.general
2942
30-
# TODO: Use ansible-test to run these.
31-
- name: Running integration tests
43+
- name: Run integration tests 🧪
3244
run: |
3345
ansible-playbook -i tests/inventory -v tests/*.yml -e ansible_python_interpreter=$(which python3)

roles/vault/tasks/consul.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
CONSUL_CLIENT_INTERFACE: "{{ consul_bind_interface }}"
1515
command: >
1616
consul agent
17-
-bind "{{ hostvars[inventory_hostname].ansible_facts[consul_bind_interface | replace('-','_')].ipv4.address }}"
17+
-bind "{{ hostvars[inventory_hostname].ansible_facts[consul_bind_interface | replace('-', '_')].ipv4.address }}"
1818
-data-dir /consul/data
1919
-server
2020
-http-port "{{ consul_bind_port }}"
2121
-bootstrap-expect "{{ ansible_play_hosts | length }}"
2222
{% for host in ansible_play_hosts %}
2323
{% if host != inventory_hostname %}
24-
-retry-join "{{ hostvars[host].ansible_facts[consul_bind_interface | replace('-','_')].ipv4.address }}"
24+
-retry-join "{{ hostvars[host].ansible_facts[consul_bind_interface | replace('-', '_')].ipv4.address }}"
2525
{% endif %}
2626
{% endfor %}
2727
become: true

roles/vault_pki/tasks/intermediate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
{{ intermediate_ca_csr_signed.data.certificate }}
9090
{{ intermediate_ca_csr_signed.data.issuing_ca }}
9191
{{ intermediate_ca_csr.data.private_key }}
92-
dest: "{{ vault_pki_certificates_directory }}/{{ vault_pki_intermediate_ca_name |replace(' ', '-') }}.pem"
92+
dest: "{{ vault_pki_certificates_directory }}/{{ vault_pki_intermediate_ca_name | replace(' ', '-') }}.pem"
9393
mode: "0600"
9494
delegate_to: "{{ vault_pki_write_certificates_host }}"
9595
when:

0 commit comments

Comments
 (0)