summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-12-08 08:11:52 +0000
committerGerrit Code Review <review@openstack.org>2015-12-08 08:11:52 +0000
commit50e0cfc6fb7a3226782f15f34ff031f82dc0ae23 (patch)
tree4ad85286e8b61bd09b954ccffd45b71f7d56953d
parent2b36ccb8acba6b5469260500485fd9cb720d6b4f (diff)
parent2600c7f0ba7ed5de9c33f17f310843ad4794754e (diff)
Merge "Add cfacter to puppet3 nodes"
-rw-r--r--modules/openstack_project/manifests/template.pp8
1 files changed, 8 insertions, 0 deletions
diff --git a/modules/openstack_project/manifests/template.pp b/modules/openstack_project/manifests/template.pp
index 04cc6a7..6a46a19 100644
--- a/modules/openstack_project/manifests/template.pp
+++ b/modules/openstack_project/manifests/template.pp
@@ -279,10 +279,12 @@ class openstack_project::template (
279 '2.7.': { 279 '2.7.': {
280 $pin_facter = '1.' 280 $pin_facter = '1.'
281 $pin_puppetdb = '1.' 281 $pin_puppetdb = '1.'
282 $cfacter = false
282 } 283 }
283 /^3\./: { 284 /^3\./: {
284 $pin_facter = '2.' 285 $pin_facter = '2.'
285 $pin_puppetdb = '2.' 286 $pin_puppetdb = '2.'
287 $cfacter = true
286 } 288 }
287 default: { 289 default: {
288 fail("Puppet version not supported") 290 fail("Puppet version not supported")
@@ -305,6 +307,12 @@ class openstack_project::template (
305 307
306 } 308 }
307 309
310 if $cfacter {
311 package { 'cfacter':
312 ensure => latest,
313 }
314 }
315
308 # Which Puppet do I take? 316 # Which Puppet do I take?
309 # Take $puppet_version and pin to that version 317 # Take $puppet_version and pin to that version
310 if ($::osfamily == 'Debian') { 318 if ($::osfamily == 'Debian') {