openstack/puppet-nova
Code Issues Proposed changes

Merge "Add support for [cinder] debug"

Browse Source
This commit is contained in:
Zuul
2022-02-05 17:03:04 +00:00
committed by Gerrit Code Review
parent c7dabe6d1e f626e649f1
commit 1557253038
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/cinder.pp
View File

@@ -66,6 +66,11 @@
# (optional) Allow attach between instance and volume in different availability zones.
# Defaults to $::os_service_default
#
# [*debug*]
# (optional) Enable DEBUG logging with cinderclient and os_brick
# independently of the rest of Nova.
# Defaults to $::os_service_default
#
# DEPRECATED PARAMETERS
#
# [*region_name*]
@@ -86,6 +91,7 @@ class nova::cinder (
$catalog_info = $::os_service_default,
$http_retries = $::os_service_default,
$cross_az_attach = $::os_service_default,
$debug = $::os_service_default,
# DEPRECATED PARAMETERS
$region_name = undef,
) {
@@ -133,5 +139,6 @@ Use the nova::cinder::os_region_name parameter')
'cinder/catalog_info': value => $catalog_info_real;
'cinder/http_retries': value => $http_retries;
'cinder/cross_az_attach': value => $cross_az_attach_real;
'cinder/debug': value => $debug;
}
}

4
spec/classes/nova_cinder_spec.rb
View File

@@ -17,6 +17,7 @@ describe 'nova::cinder' do
should contain_nova_config('cinder/catalog_info').with_value('<SERVICE DEFAULT>')
should contain_nova_config('cinder/http_retries').with_value('<SERVICE DEFAULT>')
should contain_nova_config('cinder/cross_az_attach').with_value('<SERVICE DEFAULT>')
should contain_nova_config('cinder/debug').with_value('<SERVICE DEFAULT>')
end
end
@@ -40,6 +41,7 @@ describe 'nova::cinder' do
should contain_nova_config('cinder/catalog_info').with_value('<SERVICE DEFAULT>')
should contain_nova_config('cinder/http_retries').with_value('<SERVICE DEFAULT>')
should contain_nova_config('cinder/cross_az_attach').with_value('<SERVICE DEFAULT>')
should contain_nova_config('cinder/debug').with_value('<SERVICE DEFAULT>')
end
end
@@ -54,6 +56,7 @@ describe 'nova::cinder' do
:catalog_info => 'volumev3:cinderv3:publicURL',
:http_retries => 3,
:cross_az_attach => true,
:debug => true,
}
end
@@ -70,6 +73,7 @@ describe 'nova::cinder' do
should contain_nova_config('cinder/catalog_info').with_value('volumev3:cinderv3:publicURL')
should contain_nova_config('cinder/http_retries').with_value(3)
should contain_nova_config('cinder/cross_az_attach').with_value(true)
should contain_nova_config('cinder/debug').with_value(true)
end
end