[Horizon] Install php only with nagios and add ensure to package

This patch fixes bz#1039660

Change-Id: I3456e114b5a57a3d1eb6f36c76b5f73453fae67a
This commit is contained in:
Francesco Vollero
2014-01-08 17:37:22 +01:00
parent 3f99fb26c2
commit ef639982f8

View File

@@ -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',