Skip to content

Commit 2368a7c

Browse files
committed
Merge pull request #37 from puppetlabs-operations/type_ordering
Update the resource ordering for the new Splunk types.
2 parents 8ae4bac + 78ecf59 commit 2368a7c

File tree

1 file changed

+57
-24
lines changed

1 file changed

+57
-24
lines changed

manifests/init.pp

+57-24
Original file line numberDiff line numberDiff line change
@@ -138,32 +138,65 @@
138138
realize(Package[$package_name])
139139
realize(Service[$virtual_service])
140140

141-
Exec <| tag == 'splunk_server' |> {
142-
require +> Package[$package_name],
143-
before +> Service[$virtual_service],
144-
} ->
145-
File <| tag == 'splunk_server' |> {
146-
require +> Package[$package_name],
147-
before +> Service[$virtual_service],
148-
}
141+
Package <| title == $package_name |> ->
142+
Exec <| tag == 'splunk_server' |> ->
143+
File <| tag == 'splunk_server' |> ->
144+
Service <| title == $virtual_service |>
149145

150-
File <| tag == 'splunk_server' |> {
151-
require +> Package[$package_name],
152-
notify +> Service[$virtual_service],
153-
} ->
154-
Splunk_input <| tag == 'splunk_server' |> {
155-
require +> Package[$package_name],
156-
notify +> Service[$virtual_service],
157-
}
146+
Package <| title == $package_name |> ->
147+
File <| tag == 'splunk_server' |> ->
148+
Splunk_authentication <| tag == 'splunk_server' |> ~>
149+
Service <| title == $virtual_service |>
158150

159-
File <| tag == 'splunk_server' |> {
160-
require +> Package[$package_name],
161-
notify +> Service[$virtual_service],
162-
} ->
163-
Splunk_output <| tag == 'splunk_server' |> {
164-
require +> Package[$package_name],
165-
notify +> Service[$virtual_service],
166-
}
151+
Package <| title == $package_name |> ->
152+
File <| tag == 'splunk_server' |> ->
153+
Splunk_authorize <| tag == 'splunk_server' |> ~>
154+
Service <| title == $virtual_service |>
155+
156+
Package <| title == $package_name |> ->
157+
File <| tag == 'splunk_server' |> ->
158+
Splunk_distsearch <| tag == 'splunk_server' |> ~>
159+
Service <| title == $virtual_service |>
160+
161+
Package <| title == $package_name |> ->
162+
File <| tag == 'splunk_server' |> ->
163+
Splunk_indexes <| tag == 'splunk_server' |> ~>
164+
Service <| title == $virtual_service |>
165+
166+
Package <| title == $package_name |> ->
167+
File <| tag == 'splunk_server' |> ->
168+
Splunk_input <| tag == 'splunk_server' |> ~>
169+
Service <| title == $virtual_service |>
170+
171+
Package <| title == $package_name |> ->
172+
File <| tag == 'splunk_server' |> ->
173+
Splunk_limits <| tag == 'splunk_server' |> ~>
174+
Service <| title == $virtual_service |>
175+
176+
Package <| title == $package_name |> ->
177+
File <| tag == 'splunk_server' |> ->
178+
Splunk_output <| tag == 'splunk_server' |> ~>
179+
Service <| title == $virtual_service |>
180+
181+
Package <| title == $package_name |> ->
182+
File <| tag == 'splunk_server' |> ->
183+
Splunk_props <| tag == 'splunk_server' |> ~>
184+
Service <| title == $virtual_service |>
185+
186+
Package <| title == $package_name |> ->
187+
File <| tag == 'splunk_server' |> ->
188+
Splunk_server <| tag == 'splunk_server' |> ~>
189+
Service <| title == $virtual_service |>
190+
191+
Package <| title == $package_name |> ->
192+
File <| tag == 'splunk_server' |> ->
193+
Splunk_transforms <| tag == 'splunk_server' |> ~>
194+
Service <| title == $virtual_service |>
195+
196+
Package <| title == $package_name |> ->
197+
File <| tag == 'splunk_server' |> ->
198+
Splunk_web <| tag == 'splunk_server' |> ~>
199+
Service <| title == $virtual_service |>
167200

168201
# Validate: if both Splunk and Splunk Universal Forwarder are installed on
169202
# the same system, then they must use different admin ports.

0 commit comments

Comments
 (0)