Merge "Fix cacti node and add os check"

This commit is contained in:
Jenkins 2014-07-14 21:36:56 +00:00 committed by Gerrit Code Review
commit 77ec3f4466

View File

@ -2,6 +2,11 @@
class openstack_project::cacti ( class openstack_project::cacti (
$sysadmins = [] $sysadmins = []
) { ) {
if $::osfamily != 'Debian' {
fail("${::osfamily} is not supported.")
}
class { 'openstack_project::server': class { 'openstack_project::server':
iptables_public_tcp_ports => [80, 443], iptables_public_tcp_ports => [80, 443],
sysadmins => $sysadmins, sysadmins => $sysadmins,
@ -17,7 +22,7 @@ class openstack_project::cacti (
ensure => present, ensure => present,
} }
file { '/etc/apache2/conf-available/cacti.conf': file { '/etc/apache2/conf.d/cacti.conf':
ensure => present, ensure => present,
source => 'puppet:///modules/openstack_project/cacti/apache.conf', source => 'puppet:///modules/openstack_project/cacti/apache.conf',
mode => '0644', mode => '0644',