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 3f6c6baae7..a113bda5f0 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 e198c75fbd..835d35867f 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 fb0c09e612..44d4c916e6 100644 --- a/modules/openstack_project/manifests/server.pp +++ b/modules/openstack_project/manifests/server.pp @@ -21,6 +21,6 @@ class openstack_project::server ( ca_server => $ca_server, } class { 'exim': - sysadmin => $sysadmins, + sysadmins => $sysadmins, } }