openstack/puppet-manila
Code Issues Proposed changes

Support more timeout options

Browse Source 
These are loaded by keystoneauth, when building http clinets to access
APIs.

Change-Id: I2b9630c725e0c2c34189ac4386378b69d193fdcd
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-09-11 00:49:03 +09:00
parent e04901c269
commit f15d544c12
7 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/compute/nova.pp
View File

@@ -41,6 +41,10 @@
# (optional) Region name for connecting to nova
# Defaults to $facts['os_service_default']
#
# [*timeout*]
# (optional) Timeout value for http requests
# Defaults to $facts['os_service_default']
#
# [*endpoint_type*]
# (optional) The type of nova endpoint to use when
# looking up in the keystone catalog.
@@ -68,6 +72,7 @@ class manila::compute::nova (
$project_name = 'services',
$system_scope = $facts['os_service_default'],
$region_name = $facts['os_service_default'],
$timeout = $facts['os_service_default'],
$endpoint_type = $facts['os_service_default'],
$username = 'nova',
$password = $facts['os_service_default'],
@@ -89,6 +94,7 @@ class manila::compute::nova (
'nova/auth_type': value => $auth_type;
'nova/cafile': value => $cafile;
'nova/region_name': value => $region_name;
'nova/timeout': value => $timeout;
'nova/endpoint_type': value => $endpoint_type;
'nova/username': value => $username;
'nova/user_domain_name': value => $user_domain_name;

6
manifests/image/glance.pp
View File

@@ -53,6 +53,10 @@
# (optional) Region name for connecting to cinder
# Defaults to $facts['os_service_default']
#
# [*timeout*]
# (optional) Timeout value for http requests
# Defaults to $facts['os_service_default']
#
# [*endpoint_type*]
# (optional) The type of cinder endpoint to use when
# looking up in the keystone catalog.
@@ -79,6 +83,7 @@ class manila::image::glance (
$project_name = 'services',
$system_scope = $facts['os_service_default'],
$region_name = $facts['os_service_default'],
$timeout = $facts['os_service_default'],
$endpoint_type = $facts['os_service_default'],
$username = 'glance',
$password = $facts['os_service_default'],
@@ -106,6 +111,7 @@ class manila::image::glance (
'glance/project_name': value => $project_name_real;
'glance/system_scope': value => $system_scope;
'glance/region_name': value => $region_name;
'glance/timeout': value => $timeout;
'glance/endpoint_type': value => $endpoint_type;
'glance/username': value => $username;
'glance/password': value => $password, secret => true;

6
manifests/volume/cinder.pp
View File

@@ -41,6 +41,10 @@
# (optional) Region name for connecting to cinder
# Defaults to $facts['os_service_default']
#
# [*timeout*]
# (optional) Timeout value for http requests
# Defaults to $facts['os_service_default']
#
# [*endpoint_type*]
# (optional) The type of cinder endpoint to use when
# looking up in the keystone catalog.
@@ -74,6 +78,7 @@ class manila::volume::cinder (
$system_scope = $facts['os_service_default'],
$region_name = $facts['os_service_default'],
$endpoint_type = $facts['os_service_default'],
$timeout = $facts['os_service_default'],
$username = 'cinder',
$password = $facts['os_service_default'],
$http_retries = $facts['os_service_default'],
@@ -95,6 +100,7 @@ class manila::volume::cinder (
'cinder/auth_type': value => $auth_type;
'cinder/cafile': value => $cafile;
'cinder/region_name': value => $region_name;
'cinder/timeout': value => $timeout;
'cinder/endpoint_type': value => $endpoint_type;
'cinder/username': value => $username;
'cinder/user_domain_name': value => $user_domain_name;

8
releasenotes/notes/timeout-opts-3f34b50cc9eb96f1.yaml Normal file
View File

@@ -0,0 +1,8 @@
---
features:
- |
The new ``timeout`` parameter has been added to the following classes.
- ``manila::compute::nova``
- ``manila::image::glance``
- ``manila::volume::cinder``

3
spec/classes/manila_compute_nova_spec.rb
View File

@@ -13,6 +13,7 @@ describe 'manila::compute::nova' do
is_expected.to contain_manila_config('nova/project_name').with_value('services')
is_expected.to contain_manila_config('nova/system_scope').with_value('<SERVICE DEFAULT>')
is_expected.to contain_manila_config('nova/region_name').with_value('<SERVICE DEFAULT>')
is_expected.to contain_manila_config('nova/timeout').with_value('<SERVICE DEFAULT>')
is_expected.to contain_manila_config('nova/endpoint_type').with_value('<SERVICE DEFAULT>')
is_expected.to contain_manila_config('nova/username').with_value('nova')
is_expected.to contain_manila_config('nova/password').with_value('<SERVICE DEFAULT>')
@@ -28,6 +29,7 @@ describe 'manila::compute::nova' do
:auth_type => 'v3password',
:cafile => '/etc/ssl/certs/ca.crt',
:region_name => 'RegionOne',
:timeout => 60,
:endpoint_type => 'publicURL',
:username => 'novav1',
:password => '123123',
@@ -45,6 +47,7 @@ describe 'manila::compute::nova' do
is_expected.to contain_manila_config('nova/project_name').with_value('services')
is_expected.to contain_manila_config('nova/system_scope').with_value('<SERVICE DEFAULT>')
is_expected.to contain_manila_config('nova/region_name').with_value('RegionOne')
is_expected.to contain_manila_config('nova/timeout').with_value(60)
is_expected.to contain_manila_config('nova/endpoint_type').with_value('publicURL')
is_expected.to contain_manila_config('nova/username').with_value('novav1')
is_expected.to contain_manila_config('nova/password').with_value('123123').with_secret(true)

3
spec/classes/manila_image_glance_spec.rb
View File

@@ -16,6 +16,7 @@ describe 'manila::image::glance' do
is_expected.to contain_manila_config('glance/project_name').with_value('services')
is_expected.to contain_manila_config('glance/system_scope').with_value('<SERVICE DEFAULT>')
is_expected.to contain_manila_config('glance/region_name').with_value('<SERVICE DEFAULT>')
is_expected.to contain_manila_config('glance/timeout').with_value('<SERVICE DEFAULT>')
is_expected.to contain_manila_config('glance/endpoint_type').with_value('<SERVICE DEFAULT>')
is_expected.to contain_manila_config('glance/username').with_value('glance')
is_expected.to contain_manila_config('glance/password').with_value('<SERVICE DEFAULT>').with_secret(true)
@@ -31,6 +32,7 @@ describe 'manila::image::glance' do
:auth_type => 'v3password',
:cafile => '/etc/ssl/certs/ca.crt',
:region_name => 'RegionOne',
:timeout => 60,
:endpoint_type => 'publicURL',
:username => 'glancev1',
:password => '123123',
@@ -50,6 +52,7 @@ describe 'manila::image::glance' do
is_expected.to contain_manila_config('glance/project_name').with_value('services')
is_expected.to contain_manila_config('glance/system_scope').with_value('<SERVICE DEFAULT>')
is_expected.to contain_manila_config('glance/region_name').with_value('RegionOne')
is_expected.to contain_manila_config('glance/timeout').with_value(60)
is_expected.to contain_manila_config('glance/endpoint_type').with_value('publicURL')
is_expected.to contain_manila_config('glance/username').with_value('glancev1')
is_expected.to contain_manila_config('glance/password').with_value('123123').with_secret(true)

3
spec/classes/manila_volume_cinder_spec.rb
View File

@@ -9,6 +9,7 @@ describe 'manila::volume::cinder' do
is_expected.to contain_manila_config('cinder/auth_type').with_value('password')
is_expected.to contain_manila_config('cinder/cafile').with_value('<SERVICE DEFAULT>')
is_expected.to contain_manila_config('cinder/region_name').with_value('<SERVICE DEFAULT>')
is_expected.to contain_manila_config('cinder/timeout').with_value('<SERVICE DEFAULT>')
is_expected.to contain_manila_config('cinder/endpoint_type').with_value('<SERVICE DEFAULT>')
is_expected.to contain_manila_config('cinder/user_domain_name').with_value('Default')
is_expected.to contain_manila_config('cinder/project_domain_name').with_value('Default')
@@ -29,6 +30,7 @@ describe 'manila::volume::cinder' do
:auth_type => 'v3password',
:cafile => '/etc/ssl/certs/ca.crt',
:region_name => 'RegionOne',
:timeout => 60,
:endpoint_type => 'publicURL',
:username => 'cinderv1',
:password => '123123',
@@ -46,6 +48,7 @@ describe 'manila::volume::cinder' do
is_expected.to contain_manila_config('cinder/project_domain_name').with_value('Default')
is_expected.to contain_manila_config('cinder/project_name').with_value('services')
is_expected.to contain_manila_config('cinder/region_name').with_value('RegionOne')
is_expected.to contain_manila_config('cinder/timeout').with_value(60)
is_expected.to contain_manila_config('cinder/system_scope').with_value('<SERVICE DEFAULT>')
is_expected.to contain_manila_config('cinder/endpoint_type').with_value('publicURL')
is_expected.to contain_manila_config('cinder/username').with_value('cinderv1')