From 5850aa3e015a3885dcee0046885fae84194baca5 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Wed, 9 Dec 2015 11:43:03 +1100
Subject: [PATCH] Revert "Add cfacter to puppet3 nodes"

This reverts commit 2600c7f0ba7ed5de9c33f17f310843ad4794754e.

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
---
 modules/openstack_project/manifests/template.pp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/modules/openstack_project/manifests/template.pp b/modules/openstack_project/manifests/template.pp
index 6a46a19231..04cc6a7685 100644
--- a/modules/openstack_project/manifests/template.pp
+++ b/modules/openstack_project/manifests/template.pp
@@ -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') {