Merge "Align exim module parameter name with the tree"

modules/exim/manifests/init.pp

@@ -4,7 +4,7 @@ class exim(
   $queue_run_max = '5',
   $queue_smtp_domains = '',
   $smarthost = false,
-  $sysadmin = []
+  $sysadmins = []
 ) {
 
   include exim::params

modules/exim/templates/aliases.erb

@@ -14,6 +14,6 @@ security: root
 
 gerrit2: root
 jenkins: root
-<% if sysadmin.length > 0 -%>
+<% if sysadmins.length > 0 -%>
-root: <%= sysadmin.join(",") %>
+root: <%= sysadmins.join(",") %>
 <% end -%>

modules/openstack_project/manifests/cacti.pp

@@ -1,6 +1,4 @@
 # Class to configure cacti on a node.
-# Takes a list of sysadmin email addresses as a parameter. Exim will be
-# configured to email cron spam and other alerts to this list of admins.
 class openstack_project::cacti (
   $sysadmins = []
 ) {

modules/openstack_project/manifests/graphite.pp

@@ -1,6 +1,4 @@
 # Class to configure graphite on a node.
-# Takes a list of sysadmin email addresses as a parameter. Exim will be
-# configured to email cron spam and other alerts to this list of admins.
 class openstack_project::graphite (
   $sysadmins = [],
   $graphite_admin_user = '',

modules/openstack_project/manifests/lists.pp

@@ -14,7 +14,7 @@ class openstack_project::lists(
   $listdomain = 'lists.openstack.org'
 
   class { 'exim':
-    sysadmin        => $listadmins,
+    sysadmins       => $listadmins,
     queue_interval  => '1m',
     queue_run_max   => '50',
     mailman_domains => [$listdomain],

modules/openstack_project/manifests/server.pp

@@ -21,6 +21,6 @@ class openstack_project::server (
     ca_server                 => $ca_server,
   }
   class { 'exim':
-    sysadmin => $sysadmins,
+    sysadmins => $sysadmins,
   }
 }