openstack
/
puppet-horizon
Code Issues Proposed changes

Merge "Fixed ubuntu package dependency on puppet 4.3"

This commit is contained in:
Jenkins 2016-03-22 16:36:37 +00:00 committed by Gerrit Code Review
parent 38d9c7ecb6 e445ac1ab6
commit 3d92d5099a
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/wsgi/apache.pp
View File

@ -168,8 +168,8 @@ class horizon::wsgi::apache (
fail("Invalid redirect type '${redirect_type} provided.")
}
Package['horizon'] -> Package[$::horizon::params::http_service]
File[$::horizon::params::config_file] ~> Service[$::horizon::params::http_service]
Package['horizon'] -> Package['httpd']
File[$::horizon::params::config_file] ~> Service['httpd']
$unix_user = $::osfamily ? {
'RedHat' => $::horizon::params::apache_user,
@ -184,7 +184,7 @@ class horizon::wsgi::apache (
ensure => directory,
owner => $unix_user,
group => $unix_group,
before => Service[$::horizon::params::http_service],
before => Service['httpd'],
mode => '0751',
require => Package['horizon'],
}
@ -193,7 +193,7 @@ class horizon::wsgi::apache (
ensure => file,
owner => $unix_user,
group => $unix_group,
before => Service[$::horizon::params::http_service],
before => Service['httpd'],
mode => '0640',
require => [ File[$::horizon::params::logdir], Package['horizon'] ],
}

2
spec/classes/horizon_wsgi_apache_spec.rb
View File

@ -33,6 +33,7 @@ describe 'horizon::wsgi::apache' do
is_expected.to contain_class('apache')
is_expected.to contain_class('apache::mod::wsgi')
is_expected.to contain_service('httpd').with_name(platforms_params[:http_service])
is_expected.to contain_package('httpd').with_name(platforms_params[:http_service])
is_expected.to contain_file(platforms_params[:httpd_config_file])
is_expected.to contain_package('horizon').with_ensure('present')
is_expected.to contain_apache__vhost('horizon_vhost').with(
@ -68,6 +69,7 @@ describe 'horizon::wsgi::apache' do
is_expected.to contain_class('apache')
is_expected.to contain_class('apache::mod::wsgi')
is_expected.to contain_service('httpd').with_name(platforms_params[:http_service])
is_expected.to contain_package('httpd').with_name(platforms_params[:http_service])
is_expected.to contain_file(platforms_params[:httpd_config_file])
is_expected.to contain_package('horizon').with_ensure('present')
is_expected.to contain_apache__vhost('horizon_vhost').with(