Merge "Adapt to new type validation in puppetlabs-apache"
This commit is contained in:
commit
a50b560971
|
@ -323,7 +323,7 @@ class ironic::pxe (
|
|||
include apache
|
||||
|
||||
apache::vhost { 'ipxe_vhost':
|
||||
priority => '10',
|
||||
priority => 10,
|
||||
options => ['Indexes','FollowSymLinks'],
|
||||
docroot => $http_root_real,
|
||||
port => $http_port_real,
|
||||
|
|
|
@ -46,7 +46,7 @@
|
|||
#
|
||||
# [*priority*]
|
||||
# (optional) The priority for the vhost.
|
||||
# Defaults to '10'
|
||||
# Defaults to 10
|
||||
#
|
||||
# [*threads*]
|
||||
# (optional) The number of threads for the vhost.
|
||||
|
@ -68,11 +68,11 @@
|
|||
#
|
||||
# [*access_log_file*]
|
||||
# The log file name for the virtualhost.
|
||||
# Optional. Defaults to false.
|
||||
# Optional. Defaults to undef.
|
||||
#
|
||||
# [*access_log_format*]
|
||||
# The log format for the virtualhost.
|
||||
# Optional. Defaults to false.
|
||||
# Optional. Defaults to undef.
|
||||
#
|
||||
# [*error_log_file*]
|
||||
# The error log file name for the virtualhost.
|
||||
|
@ -126,9 +126,9 @@ class ironic::wsgi::apache (
|
|||
$ssl_certs_dir = undef,
|
||||
$wsgi_process_display_name = undef,
|
||||
$threads = 15,
|
||||
$priority = '10',
|
||||
$access_log_file = false,
|
||||
$access_log_format = false,
|
||||
$priority = 10,
|
||||
$access_log_file = undef,
|
||||
$access_log_format = undef,
|
||||
$error_log_file = undef,
|
||||
$custom_wsgi_process_options = {},
|
||||
$headers = undef,
|
||||
|
|
|
@ -9,6 +9,7 @@ describe 'ironic::wsgi::apache' do
|
|||
:bind_port => 6385,
|
||||
:group => 'ironic',
|
||||
:path => '/',
|
||||
:priority => 10,
|
||||
:servername => facts[:fqdn],
|
||||
:ssl => false,
|
||||
:threads => 15,
|
||||
|
@ -22,8 +23,8 @@ describe 'ironic::wsgi::apache' do
|
|||
:headers => nil,
|
||||
:request_headers => nil,
|
||||
:custom_wsgi_process_options => {},
|
||||
:access_log_file => false,
|
||||
:access_log_format => false,
|
||||
:access_log_file => nil,
|
||||
:access_log_format => nil,
|
||||
)}
|
||||
end
|
||||
|
||||
|
@ -34,7 +35,7 @@ describe 'ironic::wsgi::apache' do
|
|||
:bind_host => '10.42.51.1',
|
||||
:port => 12345,
|
||||
:ssl => true,
|
||||
:vhost_custom_fragment => 'Timeout 99',
|
||||
:vhost_custom_fragment => 'Timeout 99',
|
||||
:wsgi_process_display_name => 'ironic',
|
||||
:workers => 37,
|
||||
:access_log_file => '/var/log/httpd/access_log',
|
||||
|
|
Loading…
Reference in New Issue