Skip to content

Commit 93a85ca

Browse files
authored
[chore][Ansible] Minimal changes for certification (#7271)
* changes requested by ansible certification team * update requirements.txt for CICD * can't use name as variable name, rename to item_name * increase yamllint line length to 150. Longest existing line is 149 * add note about ansible lint * add newline at end of requirements.yml, remove unnecessary windows requirements * can't have max version pinned
1 parent 2171dc0 commit 93a85ca

File tree

11 files changed

+15
-20
lines changed

11 files changed

+15
-20
lines changed

.github/workflows/ansible.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ jobs:
159159
molecule-plugins[docker]>=25.8.12
160160
docker>=7.1.0
161161
requests>=2.32.0
162-
urllib3<3
162+
urllib3>=2
163163
164164
- name: Set up Python 3.
165165
uses: actions/setup-python@v6

deployments/ansible_collections/signalfx/splunk_otel_collector/.ansible-lint

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,8 @@ exclude_paths:
66
- "molecule/custom_vars/custom_collector_config_deprecated.yml"
77
- "molecule/custom_vars_install_old_version/custom_collector_config.yml"
88

9+
# This is required to be able to double publish the collection to Ansible Galaxy as well as
10+
# the Ansible Automation Hub. We have the variable rename on the roadmap, but want to ensure
11+
# we handle it in the smoothest way possible for users. This will be removed in the future.
912
skip_list:
1013
- "var-naming[no-role-prefix]"

deployments/ansible_collections/signalfx/splunk_otel_collector/.yamllint

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ extends: default
44

55
rules:
66
line-length:
7-
max: 120
7+
max: 150
88
level: error
99
key-duplicates: enable
1010
new-lines:

deployments/ansible_collections/signalfx/splunk_otel_collector/CHANGELOG.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
### 🛑 Breaking changes 🛑
66

7-
- Removed support for Ansible 11.X. Minimum supported Ansible version is now 12.2.0. ([#7191](https://github.com/signalfx/splunk-otel-collector/pull/7191))
8-
97
- Removed support for the following Linux distros ([#7191](https://github.com/signalfx/splunk-otel-collector/pull/7191)):
108
- Amazon Linux 2
119
- CentOS / Red Hat 8
@@ -16,8 +14,6 @@
1614

1715
### 💡 Enhancements 💡
1816

19-
- Added support for Ansible 13 ([#7191](https://github.com/signalfx/splunk-otel-collector/pull/7191))
20-
2117
- Added support for the following Linux distros ([#7191](https://github.com/signalfx/splunk-otel-collector/pull/7191)):
2218
- Debian 12
2319
- Ubuntu 24.04

deployments/ansible_collections/signalfx/splunk_otel_collector/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ Observability Cloud](https://www.splunk.com/en_us/products/observability.html).
1414

1515
### Dependencies
1616

17-
- Ansible 12.2.0+
1817
- Python 3.11+
1918

2019
### Linux
@@ -94,6 +93,7 @@ if you see something that needs to be improved in this Ansible role.
9493
please submit a new Splunk Idea. Requires a Splunk.com login.
9594
- [Splunk Support](https://splunk.my.site.com/customer/s/need-help/create-case) - Ask any question or report any issue
9695
by opening a support case. Requires Splunk Support entitlement.
96+
- As Red Hat Ansible Certified Content, this collection is entitled to support through Ansible Automation Platform (AAP). Use the Create issue button on the top right corner of the Automation Hub Collection page for any defects, feature requests, or questions on usage.
9797
9898
## Release Notes
9999

deployments/ansible_collections/signalfx/splunk_otel_collector/galaxy.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,5 @@ tags:
2828
repository: https://github.com/signalfx/splunk-otel-collector/tree/main/deployments/ansible_collections/signalfx/splunk_otel_collector
2929
build_ignore:
3030
- contributing
31+
- dist
3132
- molecule

deployments/ansible_collections/signalfx/splunk_otel_collector/molecule/shared/verify_registry_key.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
- name: Get registry entry
33
ansible.windows.win_reg_stat:
44
path: "{{ path }}"
5-
name: "{{ name }}"
5+
name: "{{ item_name }}"
66
register: reg_entry
77

88
- name: Verify registry entry value

deployments/ansible_collections/signalfx/splunk_otel_collector/molecule/with_instrumentation/windows-verify.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@
5353
ansible.builtin.include_tasks: ../shared/verify_registry_key.yml
5454
vars:
5555
path: HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment
56-
name: "{{ item.key }}"
56+
item_name: "{{ item.key }}"
5757
exists: false
5858
loop: "{{ iis_reg_values | dict2items }}"
Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1 @@
1-
ansible>=12.2.0
2-
ansible-compat<=25.8.2
3-
ansible-lint<=26.1.1
4-
molecule<=25.1.0
5-
molecule-plugins[vagrant]<=25.8.12
6-
pywinrm<=0.4.3
1+
pywinrm>=0.4.0
Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
ansible>=12.2.0
2-
ansible-lint>=26.1.0
3-
molecule>=25.5.0
4-
molecule-plugins[docker]>=25.8.12
51
docker>=7.1.0
62
requests>=2.32.0
7-
urllib3<3
3+
urllib3>=2

0 commit comments

Comments
 (0)