Revert "Add cfacter to puppet3 nodes"
This reverts commit 2600c7f0ba
.
Fedora 23 does not have puppetlabs support yet, and usually it takes
quite a while (we use native packages). I think if we want to
experiment with this, it should be opt-in for distros where it can
work.
Change-Id: I2e36a63172c03a7e8029a56f1528f66012dd6817
This commit is contained in:
parent
a9e8854c13
commit
5850aa3e01
@ -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') {
|
||||
|
Loading…
Reference in New Issue
Block a user