From a263759356bc53c242327dd19a3e7cf1c5cdd733 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 23 Sep 2025 17:22:41 +0900 Subject: [PATCH] Validate ensure parameter for package resources The minimum version of puppetlabs-stdlib has been bumped globally, so now we can use the common type definition. Change-Id: Icc876fcc6841e32564dbe96a1428e2f233f66b34 Signed-off-by: Takashi Kajinami --- manifests/controller.pp | 2 +- manifests/northd.pp | 32 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/manifests/controller.pp b/manifests/controller.pp index 0a993d0..1c20776 100644 --- a/manifests/controller.pp +++ b/manifests/controller.pp @@ -151,7 +151,7 @@ class ovn::controller ( String[1] $opts_envvar_name, String $ovn_remote, Variant[Stdlib::IP::Address, Array[Stdlib::IP::Address]] $ovn_encap_ip, - String $package_ensure = 'present', + Stdlib::Ensure::Package $package_ensure = present, Variant[Ovn::EncapType, Array[Ovn::EncapType]] $ovn_encap_type = 'geneve', Optional[Stdlib::IP::Address] $ovn_encap_ip_default = undef, Optional[Variant[String, Integer]] $ovn_encap_tos = undef, diff --git a/manifests/northd.pp b/manifests/northd.pp index 0cafd83..6f2d78c 100644 --- a/manifests/northd.pp +++ b/manifests/northd.pp @@ -92,24 +92,24 @@ class ovn::northd ( String[1] $service_name, Stdlib::Absolutepath $environment_file_path, String[1] $opts_envvar_name, - String $package_ensure = 'present', - String $dbs_listen_ip = '0.0.0.0', - Optional[String] $dbs_cluster_local_addr = undef, - Optional[String] $dbs_cluster_remote_addr = undef, + Stdlib::Ensure::Package $package_ensure = present, + String $dbs_listen_ip = '0.0.0.0', + Optional[String] $dbs_cluster_local_addr = undef, + Optional[String] $dbs_cluster_remote_addr = undef, Optional[Variant[String, Array[String]]] $ovn_northd_nb_db = undef, Optional[Variant[String, Array[String]]] $ovn_northd_sb_db = undef, - Optional[Stdlib::Absolutepath] $ovn_northd_ssl_key = undef, - Optional[Stdlib::Absolutepath] $ovn_northd_ssl_cert = undef, - Optional[Stdlib::Absolutepath] $ovn_northd_ssl_ca_cert = undef, - Optional[Stdlib::Absolutepath] $ovn_nb_db_ssl_key = undef, - Optional[Stdlib::Absolutepath] $ovn_nb_db_ssl_cert = undef, - Optional[Stdlib::Absolutepath] $ovn_nb_db_ssl_ca_cert = undef, - Optional[Stdlib::Absolutepath] $ovn_sb_db_ssl_key = undef, - Optional[Stdlib::Absolutepath] $ovn_sb_db_ssl_cert = undef, - Optional[Stdlib::Absolutepath] $ovn_sb_db_ssl_ca_cert = undef, - Optional[Integer[0]] $ovn_nb_db_inactivity_probe = undef, - Optional[Integer[0]] $ovn_sb_db_inactivity_probe = undef, - Array[String] $ovn_northd_extra_opts = [], + Optional[Stdlib::Absolutepath] $ovn_northd_ssl_key = undef, + Optional[Stdlib::Absolutepath] $ovn_northd_ssl_cert = undef, + Optional[Stdlib::Absolutepath] $ovn_northd_ssl_ca_cert = undef, + Optional[Stdlib::Absolutepath] $ovn_nb_db_ssl_key = undef, + Optional[Stdlib::Absolutepath] $ovn_nb_db_ssl_cert = undef, + Optional[Stdlib::Absolutepath] $ovn_nb_db_ssl_ca_cert = undef, + Optional[Stdlib::Absolutepath] $ovn_sb_db_ssl_key = undef, + Optional[Stdlib::Absolutepath] $ovn_sb_db_ssl_cert = undef, + Optional[Stdlib::Absolutepath] $ovn_sb_db_ssl_ca_cert = undef, + Optional[Integer[0]] $ovn_nb_db_inactivity_probe = undef, + Optional[Integer[0]] $ovn_sb_db_inactivity_probe = undef, + Array[String] $ovn_northd_extra_opts = [], ) { include vswitch::ovs