From abd563b5e1918f314792f0e74adcf58cb526349e Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Mon, 23 Jul 2012 17:38:22 -0500 Subject: [PATCH] Control admin lists from hiera. Change-Id: I9677484fa6a05353809a104c0756800ce56371fc --- modules/openstack_project/manifests/init.pp | 8 +------- modules/openstack_project/manifests/lists.pp | 5 +---- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/modules/openstack_project/manifests/init.pp b/modules/openstack_project/manifests/init.pp index 3dc6c5609d..9bd1205b4e 100644 --- a/modules/openstack_project/manifests/init.pp +++ b/modules/openstack_project/manifests/init.pp @@ -2,13 +2,7 @@ class openstack_project { $jenkins_ssh_key = 'ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAtioTW2wh3mBRuj+R0Jyb/mLt5sjJ8dEvYyA8zfur1dnqEt5uQNLacW4fHBDFWJoLHfhdfbvray5wWMAcIuGEiAA2WEH23YzgIbyArCSI+z7gB3SET8zgff25ukXlN+1mBSrKWxIza+tB3NU62WbtO6hmelwvSkZ3d7SDfHxrc4zEpmHDuMhxALl8e1idqYzNA+1EhZpbcaf720mX+KD3oszmY2lqD1OkKMquRSD0USXPGlH3HK11MTeCArKRHMgTdIlVeqvYH0v0Wd1w/8mbXgHxfGzMYS1Ej0fzzJ0PC5z5rOqsMqY1X2aC1KlHIFLAeSf4Cx0JNlSpYSrlZ/RoiQ== hudson@hudson' - $sysadmin = [ - 'corvus@inaugust.com', - 'mordred@inaugust.com', - 'andrew@linuxjedi.co.uk', - 'devananda.vdv@gmail.com', - 'clark.boylan@gmail.com' - ] + $sysadmin = hiera('sysadmins') $project_list = [ { name => 'openstack/keystone', diff --git a/modules/openstack_project/manifests/lists.pp b/modules/openstack_project/manifests/lists.pp index fd04e5b2f6..e2260df9d2 100644 --- a/modules/openstack_project/manifests/lists.pp +++ b/modules/openstack_project/manifests/lists.pp @@ -1,5 +1,3 @@ -$sysadmins = $openstack_project::sysadmins - class openstack_project::lists { # Using openstack_project::template instead of openstack_project::server # because the exim config on this machine is almost certainly @@ -8,9 +6,8 @@ class openstack_project::lists { iptables_public_tcp_ports => [25, 80, 465] } - $sysadmins += ['duncan@dreamhost.com'] class { 'exim': - sysadmin => $sysadmins, + sysadmin => hiera('listadmins'), mailman_domains => ['lists.openstack.org'], }