Skip to content

Commit 7601f71

Browse files
committed
revert all windows ansible changes, handled in separate PR
1 parent 47d9bf1 commit 7601f71

File tree

3 files changed

+6
-10
lines changed

3 files changed

+6
-10
lines changed

deployments/ansible/molecule/custom_vars/windows-converge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
splunk_api_url: https://fake-splunk-api.com
99
splunk_hec_url: https://fake-splunk-hec.com
1010
splunk_hec_token: fake-hec-token
11-
splunk_otel_collector_version: 0.126.0
11+
splunk_otel_collector_version: 0.48.0
1212
splunk_otel_collector_config: '{{ansible_env.ProgramData}}\Splunk\OpenTelemetry Collector\custom_config.yml'
1313
splunk_otel_collector_config_source: ./custom_collector_config.yml
1414
splunk_memory_total_mib: 256

deployments/ansible/molecule/custom_vars/windows-verify.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,20 +45,20 @@
4545
assert:
4646
that: not service_status.changed
4747

48-
- name: Download splunk-otel-collector 0.126.0 MSI
48+
- name: Download splunk-otel-collector 0.48.0 MSI
4949
ansible.windows.win_get_url:
50-
url: https://dl.signalfx.com/splunk-otel-collector/msi/release/splunk-otel-collector-0.126.0-amd64.msi
50+
url: https://dl.signalfx.com/splunk-otel-collector/msi/release/splunk-otel-collector-0.48.0-amd64.msi
5151
dest: "{{ansible_env.TEMP}}"
5252
register: otel_msi_package
5353

54-
- name: Install splunk-otel-collector 0.126.0 MSI
54+
- name: Install splunk-otel-collector 0.48.0 MSI
5555
ansible.windows.win_package:
5656
path: "{{otel_msi_package.dest}}"
5757
state: present
5858
check_mode: yes
5959
register: msi_installed
6060

61-
- name: Assert splunk-otel-collector 0.126.0 MSI is already installed
61+
- name: Assert splunk-otel-collector 0.48.0 MSI is already installed
6262
assert:
6363
that: not msi_installed.changed
6464

deployments/ansible/roles/collector/tasks/otel_win_install.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,12 @@
6161
set_fact:
6262
msi_arguments: "{{ msi_unfiltered_arguments | reject('eq', '') | list }}"
6363

64-
- debug:
65-
var: msi_arguments
66-
6764
- name: Install splunk-otel-collector-msi
6865
when: splunk_collector_msi_is_configurable is defined
6966
ansible.windows.win_package:
7067
path: "{{otel_msi_package.dest}}"
7168
state: present
72-
arguments: >-
73-
"{{ msi_arguments }}"
69+
arguments: "{{ msi_arguments }}"
7470

7571
- name: Install splunk-otel-collector-msi-legacy
7672
when: splunk_collector_msi_is_configurable is undefined

0 commit comments

Comments
 (0)