openstack/puppet-ceph
Code Issues Proposed changes

rgw: Use native class to enable mod-proxy_fcgi

Browse Source 
puppetlabs-apache provides the native class since 1.9.0[1].

[1] 71cb7302f2

Change-Id: I73474920b854034c2475df3d583f8fb8d8a5d538
This commit is contained in:
Takashi Kajinami
2023-09-08 09:40:10 +09:00
parent 30f9f59fe5
commit 4380fa4f14
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/rgw/apache_proxy_fcgi.pp
View File

@@ -104,7 +104,7 @@ define ceph::rgw::apache_proxy_fcgi (
include apache::mod::mime include apache::mod::mime
include apache::mod::rewrite include apache::mod::rewrite
include apache::mod::proxy include apache::mod::proxy
apache::mod { 'proxy_fcgi': } include apache::mod::proxy_fcgi
apache::vhost { "${rgw_dns_name}-radosgw": apache::vhost { "${rgw_dns_name}-radosgw":
servername => $rgw_dns_name, servername => $rgw_dns_name,

2
spec/defines/ceph_rgw_apache_proxy_fcgi_spec.rb
View File

@@ -49,6 +49,7 @@ describe 'ceph::rgw::apache_proxy_fcgi' do
it { should contain_class('apache::mod::auth_basic') } it { should contain_class('apache::mod::auth_basic') }
it { should contain_class('apache::mod::env') } it { should contain_class('apache::mod::env') }
it { should contain_class('apache::mod::proxy') } it { should contain_class('apache::mod::proxy') }
it { should contain_class('apache::mod::proxy_fcgi') }
it { should contain_class('apache::mod::mime') } it { should contain_class('apache::mod::mime') }
it { should contain_class('apache::mod::rewrite') } it { should contain_class('apache::mod::rewrite') }
end end
@@ -96,6 +97,7 @@ describe 'ceph::rgw::apache_proxy_fcgi' do
it { should contain_class('apache::mod::alias') } it { should contain_class('apache::mod::alias') }
it { should contain_class('apache::mod::proxy') } it { should contain_class('apache::mod::proxy') }
it { should contain_class('apache::mod::proxy_fcgi') }
it { should contain_class('apache::mod::mime') } it { should contain_class('apache::mod::mime') }
it { should contain_class('apache::mod::rewrite') } it { should contain_class('apache::mod::rewrite') }
end end