From 945fec88d537243270dfa753d79d74cc95706082 Mon Sep 17 00:00:00 2001 From: Dan Bode Date: Tue, 19 Mar 2013 14:28:36 -0700 Subject: [PATCH] simplify horizon external deps This commit removes external deps for horizon. They can safely be removed b/c they are now declared from within the ::horizon class as of https://github.com/puppetlabs/puppetlabs-horizon/pull/55 --- manifests/site.pp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index 636a28d..6ac9913 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -76,9 +76,7 @@ node /openstack-controller/ { sleep_time => 60, } - if $::osfamily == 'Debian' { - include 'apache' - } else { + if $::osfamily == 'Redhat' { # redhat specific dashboard stuff file_line { 'nova_sudoers': line => 'nova ALL = (root) NOPASSWD: /usr/bin/nova-rootwrap /etc/nova/rootwrap.conf *', @@ -86,10 +84,6 @@ node /openstack-controller/ { before => Package['nova-common'], } - class {'apache':} - class {'apache::mod::wsgi':} - file { '/etc/httpd/conf.d/openstack-dashboard.conf':} - nova_config { 'rpc_backend': value => 'nova.openstack.common.rpc.impl_kombu';} cinder_config { 'DEFAULT/rpc_backend': value => 'cinder.openstack.common.rpc.impl_kombu';} #selboolean{'httpd_can_network_connect':