From f03be59359fecff968a40f9d49bfcc0d0815b4b4 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 18 Sep 2024 14:50:27 +0900 Subject: [PATCH] Add validations for keystone resource parameters The underlying implementation already have type validations. Inherit these and make a few adjustment so that validation failures are raised from the external interface layer instead of the internal interface. Change-Id: Ia121d07235a2d6a55b3a6c45232bca802c811d72 --- manifests/keystone/auth.pp | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp index 4e6094d..54b3167 100644 --- a/manifests/keystone/auth.pp +++ b/manifests/keystone/auth.pp @@ -77,23 +77,23 @@ # class mistral::keystone::auth( String[1] $password, - $email = 'mistral@localhost', - $auth_name = 'mistral', - $service_name = 'mistral', - $service_type = 'workflowv2', - $public_url = 'http://127.0.0.1:8989/v2', - $admin_url = 'http://127.0.0.1:8989/v2', - $internal_url = 'http://127.0.0.1:8989/v2', - $region = 'RegionOne', - $tenant = 'services', - $roles = ['admin'], - $system_scope = 'all', - $system_roles = [], - $configure_endpoint = true, - $configure_service = true, - $configure_user = true, - $configure_user_role = true, - $service_description = 'OpenStack Workflow Service', + String[1] $email = 'mistral@localhost', + String[1] $auth_name = 'mistral', + String[1] $service_name = 'mistral', + String[1] $service_type = 'workflowv2', + Keystone::PublicEndpointUrl $public_url = 'http://127.0.0.1:8989/v2', + Keystone::EndpointUrl $admin_url = 'http://127.0.0.1:8989/v2', + Keystone::EndpointUrl $internal_url = 'http://127.0.0.1:8989/v2', + String[1] $region = 'RegionOne', + String[1] $tenant = 'services', + Array[String[1]] $roles = ['admin'], + String[1] $system_scope = 'all', + Array[String[1]] $system_roles = [], + Boolean $configure_endpoint = true, + Boolean $configure_service = true, + Boolean $configure_user = true, + Boolean $configure_user_role = true, + String[1] $service_description = 'OpenStack Workflow Service', ) { include mistral::deps