From 256de6b4e5aaacec0957f104ea0dcae8020a3c8b Mon Sep 17 00:00:00 2001 From: "R.I.Pienaar" Date: Thu, 19 Sep 2019 16:52:40 +0200 Subject: [PATCH] Revert "(#229) specifically activate clients and agents" This reverts commit 0f1fc4363e9e1f54bf55dabe82e8f36ce9e5f84c. --- manifests/module_plugin.pp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/manifests/module_plugin.pp b/manifests/module_plugin.pp index 420881c..e34192c 100644 --- a/manifests/module_plugin.pp +++ b/manifests/module_plugin.pp @@ -26,25 +26,20 @@ Optional[String] $group = $mcollective::plugin_group, Optional[String] $mode = $mcollective::plugin_mode, Enum["present", "absent"] $ensure = "present" - Boolean $activate_agent = true - Boolean $activate_client = true ) { if $client or $server { if ($server and $client) { - $activate_config = {"activate_agent" => $activate_agent, "activate_client" => $activate_client} - $merged_conf = $config.deep_merge($client_config).deep_merge($server_config) + $activate_config + $merged_conf = $config.deep_merge($client_config).deep_merge($server_config) $merged_files = $common_files + $server_files + $client_files $merged_directories = $common_directories + $server_directories + $client_directories } elsif ($server) { - $activate_config = {"activate_agent" => $activate_agent, "activate_client" => false} - $merged_conf = $config.deep_merge($server_config) + $activate_config + $merged_conf = $config.deep_merge($server_config) $merged_files = $common_files + $server_files $merged_directories = $common_directories + $server_directories } elsif ($client) { - $activate_config = {"activate_agent" => false, "activate_client" => $activate_client} - $merged_conf = $config.deep_merge($client_config) + $activate_config + $merged_conf = $config.deep_merge($client_config) $merged_files = $common_files + $client_files $merged_directories = $common_directories + $client_directories }