Skip to content

Commit 407ee97

Browse files
committed
Merge remote-tracking branch 'origin/main' into renovate/ansible-ansible-lint-26.x
# Conflicts: # .pre-commit-config.yaml
2 parents d7991e7 + d3a0277 commit 407ee97

21 files changed

Lines changed: 159 additions & 69 deletions

File tree

.github/workflows/pre-commit.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
ansible-galaxy collection install -r ansible/requirements.yml --force
5454
5555
- name: Set up Go
56-
uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6
56+
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6
5757
with:
5858
go-version: ${{ env.GO_VERSION }}
5959

.github/workflows/renovate.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
token: "${{ steps.app-token.outputs.token }}"
6464

6565
- name: Renovate
66-
uses: renovatebot/github-action@68a3ea99af6ad249940b5a9fdf44fc6d7f14378b # v46.1.6
66+
uses: renovatebot/github-action@3633cede7d4d4598438e654eac4a695e46004420 # v46.1.7
6767
env:
6868
LOG_LEVEL: "${{ inputs.logLevel || 'info' }}"
6969
RENOVATE_AUTODISCOVER: true

.hooks/requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
ansible-core==2.19.2
1+
ansible-core==2.20.4
22
docker==7.1.0
3-
docsible==0.7.25
3+
docsible==0.8.0
44
molecule==25.9.0
55
molecule-docker==2.1.0
66
molecule-plugins[docker]==25.8.12
7-
pre-commit==4.3.0
7+
pre-commit==4.5.1

.pre-commit-config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@ repos:
1313
- id: check-shebang-scripts-are-executable
1414

1515
- repo: https://github.com/rhysd/actionlint
16-
rev: v1.7.7
16+
rev: v1.7.12
1717
hooks:
1818
- id: actionlint
1919

2020
- repo: https://github.com/adrienverge/yamllint.git
21-
rev: v1.37.1
21+
rev: v1.38.0
2222
hooks:
2323
- id: yamllint
2424
entry: yamllint --strict -c .hooks/linters/yamllint.yaml
2525
exclude: 'template/provider/ludus/config\.yml|requirements_311\.yml|noansible_requirements\.yml'
2626

2727
- repo: https://github.com/codespell-project/codespell
28-
rev: v2.4.1
28+
rev: v2.4.2
2929
hooks:
3030
- id: codespell
3131
entry: codespell -q 3 -f -S ".git,.github,README.md"
@@ -43,7 +43,7 @@ repos:
4343
- id: shfmt
4444

4545
- repo: https://github.com/igorshubovych/markdownlint-cli
46-
rev: v0.45.0
46+
rev: v0.48.0
4747
hooks:
4848
- id: markdownlint
4949
args: ['--fix', '--config', '.hooks/linters/markdownlint.json']

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:24.04
22

33
RUN apt-get update \
44
&& apt-get install -y python3-pip

ansible/ansible.cfg

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,6 @@ connect_timeout = 120
5151
connect_timeout = 120
5252
connect_retry_timeout = 120
5353

54-
[ssh_connection]
55-
control_path = /tmp/ansible-ssh-%%h-%%p-%%r
56-
# Enable pipelining for SSH performance (not used for SSM but good to have)
57-
pipelining = True
58-
5954
[aws_ssm]
6055
timeout = 600
6156
# Increase timeout for S3 transfers (AnsiballZ module files)

ansible/requirements.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ collections:
55
version: 1.11.0
66
- name: community.general
77
- name: community.windows
8-
version: 1.11.0
8+
version: 1.13.0
99
- name: chocolatey.chocolatey
1010
# - name: goad.windows
1111
# type: dir

ansible/roles/common/tasks/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
when: force_dns_server | bool
99

1010
- name: Set a proxy for specific protocols
11-
community.windows.win_inet_proxy:
11+
ansible.windows.win_inet_proxy:
1212
proxy:
1313
http: "{{ ad_http_proxy }}"
1414
https: "{{ ad_https_proxy }}"
1515
bypass: ["<local>", "*.local", "169.254.169.254"]
1616
when: enable_http_proxy | bool
1717

1818
- name: Configure IE to use a specific proxy per protocol
19-
community.windows.win_inet_proxy:
19+
ansible.windows.win_inet_proxy:
2020
proxy:
2121
http: "{{ ad_http_proxy }}"
2222
https: "{{ ad_https_proxy }}"
@@ -140,7 +140,7 @@
140140
until: firewall_result is not failed
141141

142142
- name: Add a network static route
143-
community.windows.win_route:
143+
ansible.windows.win_route:
144144
destination: "{{ route_network }}"
145145
gateway: "{{ route_gateway }}"
146146
metric: 1

ansible/roles/dc_dns_conditional_forwarder/tasks/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
- name: Add DNS server zone
3-
community.windows.win_dns_zone:
3+
ansible.windows.win_dns_zone:
44
name: "{{ item }}"
55
type: forwarder
66
replication: "{{ replication }}"

ansible/roles/dns_conditional_forwarder/tasks/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
- name: Add DNS server zone
3-
community.windows.win_dns_zone:
3+
ansible.windows.win_dns_zone:
44
name: "{{ zone_name }}"
55
type: forwarder
66
replication: "{{ replication }}"

0 commit comments

Comments
 (0)