From 615e0cfb396a2936e38cf48e8e83146e7d72c49b Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Sat, 14 Jun 2014 08:07:02 -0700
Subject: [PATCH] Align exim module parameter name with the tree

The rest of the tree, literally everwhere, calls this value
sysadmins - but the exim module calls it sysadmin. This doesn't
really matter of course, but I noticed it while looking in to a
review on another patch and couldn't not fix it. Also, there are
two comments that are clearly remnants from having used exim.pp
as a starting point.

Change-Id: I184701c8c4d4b1e9d93d746b2ad0c5fc53443866
---
 modules/exim/manifests/init.pp                  | 2 +-
 modules/exim/templates/aliases.erb              | 4 ++--
 modules/openstack_project/manifests/cacti.pp    | 2 --
 modules/openstack_project/manifests/graphite.pp | 2 --
 modules/openstack_project/manifests/lists.pp    | 2 +-
 modules/openstack_project/manifests/server.pp   | 2 +-
 6 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index b641ddaf41..9444bff72c 100644
--- a/modules/exim/manifests/init.pp
+++ b/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
diff --git a/modules/exim/templates/aliases.erb b/modules/exim/templates/aliases.erb
index d3204c8619..879b3f1765 100644
--- a/modules/exim/templates/aliases.erb
+++ b/modules/exim/templates/aliases.erb
@@ -14,6 +14,6 @@ security: root
 
 gerrit2: root
 jenkins: root
-<% if sysadmin.length > 0 -%>
-root: <%= sysadmin.join(",") %>
+<% if sysadmins.length > 0 -%>
+root: <%= sysadmins.join(",") %>
 <% end -%>
diff --git a/modules/openstack_project/manifests/cacti.pp b/modules/openstack_project/manifests/cacti.pp
index 4bd6d17523..ea3a51f8e6 100644
--- a/modules/openstack_project/manifests/cacti.pp
+++ b/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 = []
 ) {
diff --git a/modules/openstack_project/manifests/graphite.pp b/modules/openstack_project/manifests/graphite.pp
index 98e1c5e02d..e27f59890c 100644
--- a/modules/openstack_project/manifests/graphite.pp
+++ b/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 = '',
diff --git a/modules/openstack_project/manifests/lists.pp b/modules/openstack_project/manifests/lists.pp
index 9b1024a930..a00d35288a 100644
--- a/modules/openstack_project/manifests/lists.pp
+++ b/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],
diff --git a/modules/openstack_project/manifests/server.pp b/modules/openstack_project/manifests/server.pp
index 6b1d71c531..6fcf30a8ed 100644
--- a/modules/openstack_project/manifests/server.pp
+++ b/modules/openstack_project/manifests/server.pp
@@ -17,6 +17,6 @@ class openstack_project::server (
     certname                  => $certname,
   }
   class { 'exim':
-    sysadmin => $sysadmins,
+    sysadmins => $sysadmins,
   }
 }