openstack/puppet-manila
Code Issues Proposed changes

Do not set default values for the required parameters

Browse Source 
... to raise appropriate errors if the required parameters are not set.

Change-Id: If986f2c2227fe43ea9e506153055ea80c44c2017
This commit is contained in:
Takashi Kajinami 2020-12-20 23:58:40 +09:00
parent 175ecaecde
commit 7ad9f77dfd
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
manifests/service_instance.pp
View File

@ -2,6 +2,12 @@
# #
# ===Parameters # ===Parameters
# #
# [*service_instance_user*]
# (required) User in service instance.
#
# [*service_instance_password*]
# (required) Password to service instance user.
#
# [*create_service_image*] # [*create_service_image*]
# (optional) Upload the service image to glance. # (optional) Upload the service image to glance.
# Defaults to: true # Defaults to: true
@ -12,19 +18,13 @@
# Defaults to: 'manila-service-image' # Defaults to: 'manila-service-image'
# #
# [*service_image_location*] # [*service_image_location*]
# (required) URL or pathname to the service image. This will be # (optional) URL or pathname to the service image. This will be
# loaded into Glance. # loaded into Glance. This is required when create_service_image is true.
# #
# [*service_instance_name_template*] # [*service_instance_name_template*]
# (optional) Name of service instance. # (optional) Name of service instance.
# Defaults to: 'manila_service_instance_%s' # Defaults to: 'manila_service_instance_%s'
# #
# [*service_instance_user*]
# (required) User in service instance.
#
# [*service_instance_password*]
# (required) Password to service instance user.
#
# [*manila_service_keypair_name*] # [*manila_service_keypair_name*]
# (optional) Name of keypair that will be created and used # (optional) Name of keypair that will be created and used
# for service instance. # for service instance.
@ -76,12 +76,12 @@
# Defaults to: false # Defaults to: false
# #
define manila::service_instance ( define manila::service_instance (
$service_instance_user,
$service_instance_password,
$create_service_image = true, $create_service_image = true,
$service_image_name = 'manila-service-image', $service_image_name = 'manila-service-image',
$service_image_location = undef, $service_image_location = undef,
$service_instance_name_template = 'manila_service_instance_%s', $service_instance_name_template = 'manila_service_instance_%s',
$service_instance_user = undef,
$service_instance_password = undef,
$manila_service_keypair_name = 'manila-service', $manila_service_keypair_name = 'manila-service',
$path_to_public_key = '~/.ssh/id_rsa.pub', $path_to_public_key = '~/.ssh/id_rsa.pub',
$path_to_private_key = '~/.ssh/id_rsa', $path_to_private_key = '~/.ssh/id_rsa',