opendev
/
system-config
Code Issues Proposed changes

Merge "Add cfacter to puppet3 nodes"

This commit is contained in:
Jenkins 2015-12-08 08:11:52 +00:00 committed by Gerrit Code Review
parent 2b36ccb8ac 2600c7f0ba
commit 50e0cfc6fb
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/openstack_project/manifests/template.pp
View File

@ -279,10 +279,12 @@ class openstack_project::template (
'2.7.': { '2.7.': {
$pin_facter = '1.' $pin_facter = '1.'
$pin_puppetdb = '1.' $pin_puppetdb = '1.'
$cfacter = false
} }
/^3\./: { /^3\./: {
$pin_facter = '2.' $pin_facter = '2.'
$pin_puppetdb = '2.' $pin_puppetdb = '2.'
$cfacter = true
} }
default: { default: {
fail("Puppet version not supported") fail("Puppet version not supported")
@ -305,6 +307,12 @@ class openstack_project::template (
} }
if $cfacter {
package { 'cfacter':
ensure => latest,
}
}
# Which Puppet do I take? # Which Puppet do I take?
# Take $puppet_version and pin to that version # Take $puppet_version and pin to that version
if ($::osfamily == 'Debian') { if ($::osfamily == 'Debian') {