Skip to content

Commit 447b02f

Browse files
Merge pull request #775 from splunk/develop
Release 9.0.8 and 9.1.3
2 parents baff607 + 1251a12 commit 447b02f

File tree

5 files changed

+28
-3
lines changed

5 files changed

+28
-3
lines changed

CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
# Order matters: The last matching pattern has the most precedence.
77

88
# Default owners for everything in docker-splunk:
9-
* @splunk/if-01
9+
* @splunk/splunk-internal-dev-services
1010

docs/CHANGELOG.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
## Changelog
22

33
## Navigation
4+
* [9.1.3](#913)
45
* [9.1.2](#912)
56
* [9.1.1](#911)
67
* [9.1.0.2](#9102)
78
* [9.1.0.1](#9101)
9+
* [9.0.8](#908)
810
* [9.0.7](#907)
911
* [9.0.6](#906)
1012
* [9.0.5.1](#9051)
@@ -80,6 +82,14 @@
8082

8183
---
8284

85+
## 9.1.3
86+
87+
#### Changes
88+
* Support for latest major Splunk release
89+
* Documentation updates
90+
91+
---
92+
8393
## 9.1.2
8494

8595
#### Changes
@@ -112,6 +122,14 @@
112122

113123
---
114124

125+
## 9.0.8
126+
127+
#### Changes
128+
* Support for latest major Splunk release
129+
* Documentation updates
130+
131+
---
132+
115133
## 9.0.7
116134

117135
#### Changes

roles/splunk_common/tasks/install_apps.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838
timeout: 120
3939
validate_certs: no
4040
force: yes
41+
url_username: "{{ lookup('env', 'ARTIFACTORY_USER') }}"
42+
url_password: "{{ lookup('env', 'ARTIFACTORY_TOKEN') }}"
4143
register: app_remote
4244
when:
4345
- app_url is match("^(https?|file)://.*")

roles/splunk_common/tasks/set_mgmt_port.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,8 @@
99
group: "{{ splunk.group }}"
1010
when:
1111
- "'svc_port' in splunk"
12+
register: set_mgmt_port
13+
14+
# Restart only when Splunk is running and when any of the above have changed
15+
- include_tasks: ../handlers/restart_splunk.yml
16+
when: set_mgmt_port is changed

roles/splunk_search_head/tasks/setup_multisite.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
become_user: "{{ splunk.user }}"
1414
register: set_new_master
1515
until: set_new_master.rc == 0 or (set_new_master.rc != 0 and "Cannot edit this searchhead. Use 'splunk edit cluster-master' to edit information for this searchhead." in set_new_master.stderr) or (set_new_master.rc != 0 and "Cannot edit this searchhead. Use 'splunk edit cluster-manager' to edit information for this searchhead." in set_new_master.stderr)
16-
failed_when: (set_new_master.rc != 0 and "Cannot edit this searchhead. Use 'splunk edit cluster-master' to edit information for this searchhead." not in set_new_master.stderr) or (set_new_master.rc != 0 and "Cannot edit this searchhead. Use 'splunk edit cluster-manager' to edit information for this searchhead." not in set_new_master.stderr)
16+
failed_when: set_new_master.rc != 0 and ("Cannot edit this searchhead. Use 'splunk edit cluster-master' to edit information for this searchhead." not in set_new_master.stderr and "Cannot edit this searchhead. Use 'splunk edit cluster-manager' to edit information for this searchhead." not in set_new_master.stderr)
1717
changed_when: set_new_master.rc == 0
1818
retries: "{{ retry_num }}"
1919
delay: "{{ retry_delay }}"
@@ -40,4 +40,4 @@
4040
notify:
4141
- Restart the splunkd service
4242
no_log: "{{ hide_password }}"
43-
failed_when: (set_associated_site.rc != 0 and 'No change in master or secret or site.' not in set_associated_site.stderr) or (set_associated_site.rc != 0 and 'No change in manager or secret or site.' not in set_associated_site.stderr)
43+
failed_when: set_associated_site.rc != 0 and ('No change in master or secret or site.' not in set_associated_site.stderr and 'No change in manager or secret or site.' not in set_associated_site.stderr)

0 commit comments

Comments
 (0)