From d91f44494b7856d9894368995002528097b6f111 Mon Sep 17 00:00:00 2001 From: Yann Vigara Date: Tue, 3 Sep 2013 18:53:54 +0200 Subject: [PATCH 1/3] add registration options --- manifests/init.pp | 3 +++ manifests/node.pp | 3 +++ manifests/params.pp | 2 ++ templates/server.cfg.erb | 8 ++++++-- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index fcc6703..44465b4 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -131,6 +131,9 @@ $cert_dir = $mcollective::params::cert_dir, $policies_dir = $mcollective::params::policies_dir, $direct_addressing = $mcollective::params::direct_addressing, + $registration = $mcollective::params::registration, + $registration_collective = $mcollective::params::registration_collective, + $registerinterval = undef, $ssl_source_dir = undef, ) inherits ::mcollective::params { diff --git a/manifests/node.pp b/manifests/node.pp index 684fa68..0fa918b 100644 --- a/manifests/node.pp +++ b/manifests/node.pp @@ -113,6 +113,9 @@ $policies_dir = $mcollective::policies_dir, $direct_addressing = $mcollective::direct_addressing, $ssl_source_dir = $mcollective::ssl_source_dir, + $registration = $mcollective::registration, + $registration_collective = $mcollective::registration_collective, + $registerinterval = $mcollective::registerinterval, ) { if !defined(Class['::mcollective']) { diff --git a/manifests/params.pp b/manifests/params.pp index 4792cd9..e9d59bf 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -29,6 +29,8 @@ $use_node = true $use_client = false $direct_addressing = 0 + $registration = 'Agentlist' + $registration_collective = 'registration' case $::osfamily { 'Debian': { diff --git a/templates/server.cfg.erb b/templates/server.cfg.erb index 7912458..9ea19ec 100644 --- a/templates/server.cfg.erb +++ b/templates/server.cfg.erb @@ -60,6 +60,10 @@ plugin.yaml = /etc/mcollective/facts.yaml classesfile = /var/lib/puppet/state/classes.txt -registerinterval = 300 -registration = Agentlist +# Registration +registerinterval = <%= scope.lookupvar('mcollective::node::registerinterval') %> +registration = <%= scope.lookupvar('mcollective::node::registration') %> +<% if scope.lookupvar('mcollective::node::registration_collective') %> +registration_collective = <%= scope.lookupvar('mcollective::node::registration_collective') %> +<%- end %> From 13ad4c094baf3228f5f41e5702f17745bf123b4d Mon Sep 17 00:00:00 2001 From: Yann Vigara Date: Tue, 3 Sep 2013 19:08:16 +0200 Subject: [PATCH 2/3] Add registration options --- manifests/init.pp | 10 ++++++++-- manifests/node.pp | 6 ++++++ manifests/params.pp | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 44465b4..122fc47 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -75,6 +75,12 @@ # Defaults to '/etc/mcollective/policies'. # ['direct_addressing'] - Enable direct addressing. # Defaults to '0'. +# ['registration'] - The registration plugin to use +# Defaults to 'AgentList. +# ['registerinterval'] - Registration interval +# Defaults to '300'. +# ['registration_collective'] - The registration collective to use +# Defaults to undef. # ['ssl_source_dir'] - Where to get certificates from. # Defaults to undef. # @@ -132,8 +138,8 @@ $policies_dir = $mcollective::params::policies_dir, $direct_addressing = $mcollective::params::direct_addressing, $registration = $mcollective::params::registration, - $registration_collective = $mcollective::params::registration_collective, - $registerinterval = undef, + $registerinterval = $mcollective::params::registerinterval, + $registration_collective = undef, $ssl_source_dir = undef, ) inherits ::mcollective::params { diff --git a/manifests/node.pp b/manifests/node.pp index 0fa918b..dc8d92c 100644 --- a/manifests/node.pp +++ b/manifests/node.pp @@ -63,6 +63,12 @@ # Defaults to '/etc/mcollective/policies'. # ['direct_addressing'] - Enable direct addressing. # Defaults to '0'. +# ['registration'] - The registration plugin to use +# Defaults to 'AgentList. +# ['registerinterval'] - Registration interval +# Defaults to '300'. +# ['registration_collective'] - The registration collective to use +# Defaults to undef. # ['ssl_source_dir'] - Where to get certificates from. # Defaults to undef. # diff --git a/manifests/params.pp b/manifests/params.pp index e9d59bf..2bca86a 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -30,7 +30,7 @@ $use_client = false $direct_addressing = 0 $registration = 'Agentlist' - $registration_collective = 'registration' + $registerinterval = 300 case $::osfamily { 'Debian': { From 1f4672d88e8a2bcca05707cd39d3c3858a67edc1 Mon Sep 17 00:00:00 2001 From: Yann Vigara Date: Wed, 4 Sep 2013 18:34:30 +0200 Subject: [PATCH 3/3] correct problem when registration_collective parameter is undef --- templates/server.cfg.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/server.cfg.erb b/templates/server.cfg.erb index 9ea19ec..b012c0c 100644 --- a/templates/server.cfg.erb +++ b/templates/server.cfg.erb @@ -63,7 +63,7 @@ classesfile = /var/lib/puppet/state/classes.txt # Registration registerinterval = <%= scope.lookupvar('mcollective::node::registerinterval') %> registration = <%= scope.lookupvar('mcollective::node::registration') %> -<% if scope.lookupvar('mcollective::node::registration_collective') %> +<% if scope.lookupvar('mcollective::node::registration_collective') != :undef %> registration_collective = <%= scope.lookupvar('mcollective::node::registration_collective') %> <%- end %>