Merge "Revert "Add cfacter to puppet3 nodes""

This commit is contained in:
Jenkins 2015-12-09 02:47:01 +00:00 committed by Gerrit Code Review
commit 97d6c0c091

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