Merge "Set the Apache ServerAdmin on wiki.o.o from hiera"

hiera/common.yaml

@@ -30,6 +30,7 @@ elasticsearch_clients:
 - logstash-worker20.openstack.org
 - subunit-worker01.openstack.org
 - subunit-worker02.openstack.org
+infra_apache_serveradmin: noc@openstack.org
 statusbot_channels:
 - ara
 - congress

manifests/site.pp

@@ -373,6 +373,7 @@ node 'etherpad-dev.openstack.org' {
 node 'wiki.openstack.org' {
   class { 'openstack_project::wiki':
     sysadmins                 => hiera('sysadmins', []),
+    serveradmin               => hiera('infra_apache_serveradmin'),
     ssl_cert_file_contents    => hiera('ssl_cert_file_contents'),
     ssl_key_file_contents     => hiera('ssl_key_file_contents'),
     ssl_chain_file_contents   => hiera('ssl_chain_file_contents'),

modules/openstack_project/manifests/wiki.pp

@@ -2,6 +2,7 @@
 #
 class openstack_project::wiki (
   $sysadmins = [],
+  $serveradmin = undef,
   $ssl_cert_file_contents = '',
   $ssl_key_file_contents = '',
   $ssl_chain_file_contents = '',
@@ -35,6 +36,7 @@ class openstack_project::wiki (
     role                       => 'all',
     mediawiki_location         => '/srv/mediawiki/w',
     mediawiki_images_location  => '/srv/mediawiki/images',
+    serveradmin                => $serveradmin,
     site_hostname              => $::fqdn,
     ssl_cert_file              => "/etc/ssl/certs/${::fqdn}.pem",
     ssl_key_file               => "/etc/ssl/private/${::fqdn}.key",