openstack/puppet-watcher
Code Issues Proposed changes

Do not redefine defaults for <service>_client/api_version

Browse Source 
and rely on the defaults defined in Watcher itself.

Change-Id: If54b617b7509e95734d4574840d2074fe9291c2a
This commit is contained in:
Takashi Kajinami
2021-08-19 20:51:47 +09:00
parent a156f689ab
commit d94431de6e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/init.pp
View File

@@ -10,15 +10,15 @@
# #
# [*cinder_client_api_version*] # [*cinder_client_api_version*]
# (required) Version of Cinder API to use in cinderclient. # (required) Version of Cinder API to use in cinderclient.
# Default is 3. # Default is $::os_service_default.
# #
# [*glance_client_api_version*] # [*glance_client_api_version*]
# (required) Version of Glance API to use in glanceclient. # (required) Version of Glance API to use in glanceclient.
# Default is 2. # Default is $::os_service_default.
# #
# [*neutron_client_api_version*] # [*neutron_client_api_version*]
# (required) Version of Neutron API to use in neutronclient. # (required) Version of Neutron API to use in neutronclient.
# Default is 2. # Default is $::os_service_default.
# #
# [*nova_client_api_version*] # [*nova_client_api_version*]
# (required) Version of Nova API to use in novaclient. # (required) Version of Nova API to use in novaclient.
@@ -241,9 +241,9 @@
class watcher ( class watcher (
$purge_config = false, $purge_config = false,
$use_ssl = false, $use_ssl = false,
$cinder_client_api_version = '3', $cinder_client_api_version = $::os_service_default,
$glance_client_api_version = '2', $glance_client_api_version = $::os_service_default,
$neutron_client_api_version = '2', $neutron_client_api_version = $::os_service_default,
$nova_client_api_version = $::os_service_default, $nova_client_api_version = $::os_service_default,
$package_ensure = 'present', $package_ensure = 'present',
$rabbit_login_method = $::os_service_default, $rabbit_login_method = $::os_service_default,