Skip to content

Commit 45c6d4a

Browse files
h0tw1r3h0tw1r3
committed
(maint) create type for package_ensure params type
* used quite a bit in the module * very long variant * easier to keep consistent as a type
1 parent 71c2f33 commit 45c6d4a

File tree

4 files changed

+63
-61
lines changed

4 files changed

+63
-61
lines changed

‎manifests/bindings.pp

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -85,27 +85,27 @@
8585
Boolean $client_dev = false,
8686
Boolean $daemon_dev = false,
8787
# Settings for the various classes.
88-
Variant[Enum['present','absent'], Pattern[/(\d+)[\.](\d+)[\.](\d+)/]] $java_package_ensure = $mysql::params::java_package_ensure,
89-
String[1] $java_package_name = $mysql::params::java_package_name,
90-
Optional[String[1]] $java_package_provider = $mysql::params::java_package_provider,
91-
Variant[Enum['present','absent'], Pattern[/(\d+)[\.](\d+)[\.](\d+)/]] $perl_package_ensure = $mysql::params::perl_package_ensure,
92-
String[1] $perl_package_name = $mysql::params::perl_package_name,
93-
Optional[String[1]] $perl_package_provider = $mysql::params::perl_package_provider,
94-
Variant[Enum['present','absent'], Pattern[/(\d+)[\.](\d+)[\.](\d+)/]] $php_package_ensure = $mysql::params::php_package_ensure,
95-
String[1] $php_package_name = $mysql::params::php_package_name,
96-
Optional[String[1]] $php_package_provider = $mysql::params::php_package_provider,
97-
Variant[Enum['present','absent'], Pattern[/(\d+)[\.](\d+)[\.](\d+)/]] $python_package_ensure = $mysql::params::python_package_ensure,
98-
String[1] $python_package_name = $mysql::params::python_package_name,
99-
Optional[String[1]] $python_package_provider = $mysql::params::python_package_provider,
100-
Variant[Enum['present','absent'], Pattern[/(\d+)[\.](\d+)[\.](\d+)/]] $ruby_package_ensure = $mysql::params::ruby_package_ensure,
101-
String[1] $ruby_package_name = $mysql::params::ruby_package_name,
102-
Optional[String[1]] $ruby_package_provider = $mysql::params::ruby_package_provider,
103-
Variant[Enum['present','absent'], Pattern[/(\d+)[\.](\d+)[\.](\d+)/]] $client_dev_package_ensure = $mysql::params::client_dev_package_ensure,
104-
Optional[String[1]] $client_dev_package_name = $mysql::params::client_dev_package_name,
105-
Optional[String[1]] $client_dev_package_provider = $mysql::params::client_dev_package_provider,
106-
Variant[Enum['present','absent'], Pattern[/(\d+)[\.](\d+)[\.](\d+)/]] $daemon_dev_package_ensure = $mysql::params::daemon_dev_package_ensure,
107-
String[1] $daemon_dev_package_name = $mysql::params::daemon_dev_package_name,
108-
Optional[String[1]] $daemon_dev_package_provider = $mysql::params::daemon_dev_package_provider
88+
Mysql::Package_ensure $java_package_ensure = $mysql::params::java_package_ensure,
89+
String[1] $java_package_name = $mysql::params::java_package_name,
90+
Optional[String[1]] $java_package_provider = $mysql::params::java_package_provider,
91+
Mysql::Package_ensure $perl_package_ensure = $mysql::params::perl_package_ensure,
92+
String[1] $perl_package_name = $mysql::params::perl_package_name,
93+
Optional[String[1]] $perl_package_provider = $mysql::params::perl_package_provider,
94+
Mysql::Package_ensure $php_package_ensure = $mysql::params::php_package_ensure,
95+
String[1] $php_package_name = $mysql::params::php_package_name,
96+
Optional[String[1]] $php_package_provider = $mysql::params::php_package_provider,
97+
Mysql::Package_ensure $python_package_ensure = $mysql::params::python_package_ensure,
98+
String[1] $python_package_name = $mysql::params::python_package_name,
99+
Optional[String[1]] $python_package_provider = $mysql::params::python_package_provider,
100+
Mysql::Package_ensure $ruby_package_ensure = $mysql::params::ruby_package_ensure,
101+
String[1] $ruby_package_name = $mysql::params::ruby_package_name,
102+
Optional[String[1]] $ruby_package_provider = $mysql::params::ruby_package_provider,
103+
Mysql::Package_ensure $client_dev_package_ensure = $mysql::params::client_dev_package_ensure,
104+
Optional[String[1]] $client_dev_package_name = $mysql::params::client_dev_package_name,
105+
Optional[String[1]] $client_dev_package_provider = $mysql::params::client_dev_package_provider,
106+
Mysql::Package_ensure $daemon_dev_package_ensure = $mysql::params::daemon_dev_package_ensure,
107+
String[1] $daemon_dev_package_name = $mysql::params::daemon_dev_package_name,
108+
Optional[String[1]] $daemon_dev_package_provider = $mysql::params::daemon_dev_package_provider
109109
) inherits mysql::params {
110110
case $facts['os']['family'] {
111111
'Archlinux': {

‎manifests/client.pp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
# Specify the path to the package source. Optional. Valid value is a String
2525
#
2626
class mysql::client (
27-
Boolean $bindings_enable = $mysql::params::bindings_enable,
28-
Optional[Array[String[1]]] $install_options = undef,
29-
Variant[Enum['present','absent'], Pattern[/(\d+)[\.](\d+)[\.](\d+)/]] $package_ensure = $mysql::params::client_package_ensure,
30-
Boolean $package_manage = $mysql::params::client_package_manage,
31-
String[1] $package_name = $mysql::params::client_package_name,
32-
Optional[String[1]] $package_provider = undef,
33-
Optional[String[1]] $package_source = undef,
27+
Boolean $bindings_enable = $mysql::params::bindings_enable,
28+
Optional[Array[String[1]]] $install_options = undef,
29+
Mysql::Package_ensure $package_ensure = $mysql::params::client_package_ensure,
30+
Boolean $package_manage = $mysql::params::client_package_manage,
31+
String[1] $package_name = $mysql::params::client_package_name,
32+
Optional[String[1]] $package_provider = undef,
33+
Optional[String[1]] $package_source = undef,
3434
) inherits mysql::params {
3535
include 'mysql::client::install'
3636

‎manifests/server.pp

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -93,39 +93,39 @@
9393
# See the `root_password` parameter above for details on changing the root password.
9494
#
9595
class mysql::server (
96-
String[1] $config_file = $mysql::params::config_file,
97-
String[1] $config_file_mode = '0644',
98-
Optional[String] $includedir = $mysql::params::includedir,
99-
Optional[Array[String[1]]] $install_options = undef,
100-
Variant[Boolean, String[1]] $manage_config_file = true,
101-
Mysql::Options $options = {},
102-
Hash $override_options = {},
103-
Variant[Enum['present','absent'], Pattern[/(\d+)[\.](\d+)[\.](\d+)/]] $package_ensure = 'present',
104-
Boolean $package_manage = true,
105-
String[1] $package_name = $mysql::params::server_package_name,
106-
Optional[String[1]] $package_provider = undef,
107-
Optional[String[1]] $package_source = undef,
108-
Variant[Boolean, String[1]] $purge_conf_dir = false,
109-
Variant[Boolean, String[1]] $remove_default_accounts = false,
110-
Variant[Boolean, String[1]] $restart = false,
111-
String[1] $root_group = $mysql::params::root_group,
112-
Optional[Array[String[1]]] $managed_dirs = $mysql::params::managed_dirs,
113-
String[1] $mysql_group = $mysql::params::mysql_group,
114-
Optional[String[1]] $mycnf_owner = undef,
115-
Optional[String[1]] $mycnf_group = undef,
116-
Variant[String, Sensitive[String]] $root_password = 'UNSET',
117-
Variant[Boolean, String[1]] $service_enabled = true,
118-
Variant[Boolean, String[1]] $service_manage = true,
119-
String[1] $service_name = $mysql::params::server_service_name,
120-
Optional[String[1]] $service_provider = undef,
121-
Boolean $create_root_user = true,
122-
Boolean $create_root_my_cnf = true,
123-
Boolean $create_root_login_file = false,
124-
Optional[String[1]] $login_file = undef,
125-
Hash $users = {},
126-
Hash $grants = {},
127-
Hash $databases = {},
128-
Boolean $reload_on_config_change = false,
96+
String[1] $config_file = $mysql::params::config_file,
97+
String[1] $config_file_mode = '0644',
98+
Optional[String] $includedir = $mysql::params::includedir,
99+
Optional[Array[String[1]]] $install_options = undef,
100+
Variant[Boolean, String[1]] $manage_config_file = true,
101+
Mysql::Options $options = {},
102+
Hash $override_options = {},
103+
Mysql::Package_ensure $package_ensure = 'present',
104+
Boolean $package_manage = true,
105+
String[1] $package_name = $mysql::params::server_package_name,
106+
Optional[String[1]] $package_provider = undef,
107+
Optional[String[1]] $package_source = undef,
108+
Variant[Boolean, String[1]] $purge_conf_dir = false,
109+
Variant[Boolean, String[1]] $remove_default_accounts = false,
110+
Variant[Boolean, String[1]] $restart = false,
111+
String[1] $root_group = $mysql::params::root_group,
112+
Optional[Array[String[1]]] $managed_dirs = $mysql::params::managed_dirs,
113+
String[1] $mysql_group = $mysql::params::mysql_group,
114+
Optional[String[1]] $mycnf_owner = undef,
115+
Optional[String[1]] $mycnf_group = undef,
116+
Variant[String, Sensitive[String]] $root_password = 'UNSET',
117+
Variant[Boolean, String[1]] $service_enabled = true,
118+
Variant[Boolean, String[1]] $service_manage = true,
119+
String[1] $service_name = $mysql::params::server_service_name,
120+
Optional[String[1]] $service_provider = undef,
121+
Boolean $create_root_user = true,
122+
Boolean $create_root_my_cnf = true,
123+
Boolean $create_root_login_file = false,
124+
Optional[String[1]] $login_file = undef,
125+
Hash $users = {},
126+
Hash $grants = {},
127+
Hash $databases = {},
128+
Boolean $reload_on_config_change = false,
129129
# Deprecated parameters
130130
Optional[Variant[String[1], Boolean]] $enabled = undef,
131131
Optional[Variant[String[1], Boolean]] $manage_service = undef,

‎types/package_ensure.pp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# @summary Abstract for package_ensure values throughout the module
2+
type Mysql::Package_ensure = Variant[Enum['present','absent'], Pattern[/(\d+)[\.](\d+)[\.](\d+)/]]

0 commit comments

Comments
 (0)