diff --git a/manifests/middleware.pp b/manifests/middleware.pp index 3a8a70e..6443743 100644 --- a/manifests/middleware.pp +++ b/manifests/middleware.pp @@ -17,13 +17,23 @@ # (boolean value) # Defaults to $::os_service_default. # +# [*http_basic_auth_user_file*] +# (Optional) HTTP basic auth password file. +# (string value) +# Defaults to $::os_service_default. +# define oslo::middleware( + # sizelimit $max_request_body_size = $::os_service_default, + # http_proxy_to_wsgi $enable_proxy_headers_parsing = $::os_service_default, + # basic_auth + $http_basic_auth_user_file = $::os_service_default, ) { $middleware_options = { 'oslo_middleware/max_request_body_size' => { value => $max_request_body_size }, 'oslo_middleware/enable_proxy_headers_parsing' => { value => $enable_proxy_headers_parsing }, + 'oslo_middleware/http_basic_auth_user_file' => { value => $http_basic_auth_user_file }, } create_resources($name, $middleware_options) } diff --git a/releasenotes/notes/basic-auth-middleware-64bf02c8f2a710f6.yaml b/releasenotes/notes/basic-auth-middleware-64bf02c8f2a710f6.yaml new file mode 100644 index 0000000..3600a08 --- /dev/null +++ b/releasenotes/notes/basic-auth-middleware-64bf02c8f2a710f6.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + The new ``oslo::middleware::http_basic_auth_userfile`` parameter has been + added. diff --git a/spec/defines/oslo_middleware_spec.rb b/spec/defines/oslo_middleware_spec.rb index 6d58c27..637f0b6 100644 --- a/spec/defines/oslo_middleware_spec.rb +++ b/spec/defines/oslo_middleware_spec.rb @@ -10,6 +10,7 @@ describe 'oslo::middleware' do it 'configure oslo_middleware default params' do is_expected.to contain_keystone_config('oslo_middleware/max_request_body_size').with_value('') is_expected.to contain_keystone_config('oslo_middleware/enable_proxy_headers_parsing').with_value('') + is_expected.to contain_keystone_config('oslo_middleware/http_basic_auth_user_file').with_value('') end end @@ -17,13 +18,15 @@ describe 'oslo::middleware' do context 'with overridden parameters' do let :params do { - :max_request_body_size => 114600, + :max_request_body_size => 114600, :enable_proxy_headers_parsing => true, + :http_basic_auth_user_file => '/etc/htpasswd', } end it 'configure oslo_middleware with overridden values' do is_expected.to contain_keystone_config('oslo_middleware/max_request_body_size').with_value(114600) is_expected.to contain_keystone_config('oslo_middleware/enable_proxy_headers_parsing').with_value(true) + is_expected.to contain_keystone_config('oslo_middleware/http_basic_auth_user_file').with_value('/etc/htpasswd') end end