Skip to content

Commit 0faca82

Browse files
author
Tim Meusel
committed
add gcc as a missing dependency, only define if we didn't already
1 parent fbd81f6 commit 0faca82

File tree

2 files changed

+20
-6
lines changed

2 files changed

+20
-6
lines changed

manifests/agent.pp

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -311,12 +311,19 @@
311311
}
312312
if $serialization_format != undef {
313313
if $serialization_format == 'msgpack' {
314-
package {$::puppet::params::ruby_dev:
315-
ensure => 'latest',
314+
unless defined(Package[$::puppet::params::ruby_dev]) {
315+
package {$::puppet::params::ruby_dev:
316+
ensure => 'latest',
317+
}
318+
} ->
319+
unless defined(Package['gcc']) {
320+
package {'gcc':
321+
ensure => 'latest',
322+
}
316323
} ->
317324
package {'msgpack':
318325
ensure => 'latest',
319-
provide => 'gem',
326+
provider => 'gem',
320327
}
321328
}
322329
ini_setting {'puppetagentserializationformat':

manifests/master.pp

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -317,12 +317,19 @@
317317
}
318318
if $serialization_format != undef {
319319
if $serialization_format == 'msgpack' {
320-
package {$::puppet::params::ruby_dev:
321-
ensure => 'latest',
320+
unless defined(Package[$::puppet::params::ruby_dev]) {
321+
package {$::puppet::params::ruby_dev:
322+
ensure => 'latest',
323+
}
324+
} ->
325+
unless defined(Package['gcc']) {
326+
package {'gcc':
327+
ensure => 'latest',
328+
}
322329
} ->
323330
package {'msgpack':
324331
ensure => 'latest',
325-
provide => 'gem',
332+
provider => 'gem',
326333
}
327334
}
328335
ini_setting {'puppetagentserializationformat':

0 commit comments

Comments
 (0)