From ef639982f8a642b53cd96f8d1fc47ce05ac94eae Mon Sep 17 00:00:00 2001
From: Francesco Vollero <fvollero@redhat.com>
Date: Wed, 8 Jan 2014 17:37:22 +0100
Subject: [PATCH] [Horizon] Install php only with nagios and add ensure to
 package

This patch fixes bz#1039660

Change-Id: I3456e114b5a57a3d1eb6f36c76b5f73453fae67a
---
 packstack/puppet/templates/horizon.pp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/packstack/puppet/templates/horizon.pp b/packstack/puppet/templates/horizon.pp
index 925709ff1..51d038e3e 100644
--- a/packstack/puppet/templates/horizon.pp
+++ b/packstack/puppet/templates/horizon.pp
@@ -1,7 +1,7 @@
-
 $horizon_packages = ["python-memcached", "python-netaddr"]
 package {$horizon_packages:
-    notify => Class["horizon"]
+    notify => Class["horizon"],
+    ensure => present,
 }
 
 file {"/etc/httpd/conf.d/rootredirect.conf":
@@ -19,11 +19,12 @@ class {'horizon':
 }
 
 class {'memcached':}
-
-class {'apache::mod::php': }
-# The apache module purges files it doesn't know about
-# avoid this be referencing them here
-file { '/etc/httpd/conf.d/nagios.conf':}
+if '%(CONFIG_NAGIOS_INSTALL)s' == 'y' {
+  class {'apache::mod::php': }
+  # The apache module purges files it doesn't know about
+  # avoid this be referencing them here
+  file { '/etc/httpd/conf.d/nagios.conf':}
+}
 
 firewall { '001 horizon incoming':
     proto    => 'tcp',