From 5353964c52b4d7f4ee0284a6e525e1da3550e92f Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Tue, 5 Mar 2013 11:27:39 -0500
Subject: [PATCH] Configure puppet.conf on RHEL.

Fixes an issue where puppet.conf was only getting created
on Ubuntu machines. We actually need this file on *all* slaves.

Change-Id: I2d9810acd1e834853b00a9ebd1f0a1e5406a6ca9
Reviewed-on: https://review.openstack.org/23573
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Approved: Jeremy Stanley <fungi@yuggoth.org>
Tested-by: Jenkins
---
 modules/openstack_project/manifests/base.pp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/openstack_project/manifests/base.pp b/modules/openstack_project/manifests/base.pp
index adbfab9939..f577d8c51b 100644
--- a/modules/openstack_project/manifests/base.pp
+++ b/modules/openstack_project/manifests/base.pp
@@ -75,15 +75,15 @@ class openstack_project::base(
       replace => true,
     }
 
-    file { '/etc/puppet/puppet.conf':
-      ensure  => present,
-      owner   => 'root',
-      group   => 'root',
-      mode    => '0444',
-      content => template('openstack_project/puppet.conf.erb'),
-      replace => true,
-    }
+  }
 
+  file { '/etc/puppet/puppet.conf':
+    ensure  => present,
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0444',
+    content => template('openstack_project/puppet.conf.erb'),
+    replace => true,
   }
 
 }