Merge pull request #4 from sbadia/master

On debian apache2 is not an dependence of openstack-dashboard package
This commit is contained in:
Dan Bode 2012-06-11 23:48:30 -07:00
commit 9effd163ab
2 changed files with 7 additions and 2 deletions

View File

@ -0,0 +1,4 @@
OpenStack Dashboard
===================
Puppet module for [Horizon](http://horizon.openstack.org/), ([OpenStack Dashboard](http://wiki.openstack.org/OpenStackDashboard))

View File

@ -6,13 +6,13 @@ class horizon(
$cache_server_port = '11211'
) {
include horizon::params
include horizon::params
if $cache_server_ip =~ /^127\.0\.0\.1/ {
Class['memcached'] -> Class['horizon']
}
package { 'openstack-dashboard':
package { ['openstack-dashboard',"$::horizon::params::http_service"]:
ensure => present,
}
@ -24,6 +24,7 @@ class horizon(
service { 'httpd':
name => $::horizon::params::http_service,
ensure => 'running',
require => Package["$::horizon::params::http_service"],
subscribe => File['/etc/openstack-dashboard/local_settings.py']
}
}