fix dependency cycle

Tim Meusel · Tim Meusel · commit 1ab906dd3f28 · 2015-03-09T14:02:32.000+01:00
diff --git a/manifests/agent.pp b/manifests/agent.pp
@@ -322,15 +322,18 @@
           package {$::puppet::params::ruby_dev:
             ensure  => 'latest',
           }
-        } ->
+        }
         unless defined(Package['gcc']) {
           package {'gcc':
             ensure  => 'latest',
           }
-        } ->
-        package {'msgpack':
-          ensure  => 'latest',
-          provider => 'gem',
+        }
+        unless defined(Package['msgpack']) {
+          package {'msgpack':
+            ensure    => 'latest',
+            provider  => 'gem',
+            require   => Package[$::puppet::params::ruby_dev, 'gcc'],
+          }
         }
       }
     }
diff --git a/manifests/master.pp b/manifests/master.pp
@@ -332,10 +332,12 @@
             ensure  => 'latest',
           }
         }
-        package {'msgpack':
-          ensure  => 'latest',
-          provider => 'gem',
-          require   => Package[$::puppet::params::ruby_dev, 'gcc'],
+        unless defined(Package['msgpack']) {
+          package {'msgpack':
+            ensure  => 'latest',
+            provider => 'gem',
+            require   => Package[$::puppet::params::ruby_dev, 'gcc'],
+          }
         }
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -322,15 +322,18 @@`
`322`	`322`	`package {$::puppet::params::ruby_dev:`
`323`	`323`	`ensure => 'latest',`
`324`	`324`	`}`
`325`		`- } ->`
	`325`	`+ }`
`326`	`326`	`unless defined(Package['gcc']) {`
`327`	`327`	`package {'gcc':`
`328`	`328`	`ensure => 'latest',`
`329`	`329`	`}`
`330`		`- } ->`
`331`		`- package {'msgpack':`
`332`		`- ensure => 'latest',`
`333`		`- provider => 'gem',`
	`330`	`+ }`
	`331`	`+ unless defined(Package['msgpack']) {`
	`332`	`+ package {'msgpack':`
	`333`	`+ ensure => 'latest',`
	`334`	`+ provider => 'gem',`
	`335`	`+ require => Package[$::puppet::params::ruby_dev, 'gcc'],`
	`336`	`+ }`
`334`	`337`	`}`
`335`	`338`	`}`
`336`	`339`	`}`
Original file line number	Diff line number	Diff line change
`@@ -332,10 +332,12 @@`
`332`	`332`	`ensure => 'latest',`
`333`	`333`	`}`
`334`	`334`	`}`
`335`		`- package {'msgpack':`
`336`		`- ensure => 'latest',`
`337`		`- provider => 'gem',`
`338`		`- require => Package[$::puppet::params::ruby_dev, 'gcc'],`
	`335`	`+ unless defined(Package['msgpack']) {`
	`336`	`+ package {'msgpack':`
	`337`	`+ ensure => 'latest',`
	`338`	`+ provider => 'gem',`
	`339`	`+ require => Package[$::puppet::params::ruby_dev, 'gcc'],`
	`340`	`+ }`
`339`	`341`	`}`
`340`	`342`	`}`
`341`	`343`	`}`