From 510f2caee351c86d3244ee2657b69f35f3d3f769 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Thu, 14 May 2015 16:48:10 -0700 Subject: [PATCH] Pass exim flag to template rather than exim class Now that the exim flag exists on template, use it in the server manifest. Change-Id: I07652ad88b77a9d551761dcae60208b571261bba --- modules/openstack_project/manifests/server.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/openstack_project/manifests/server.pp b/modules/openstack_project/manifests/server.pp index fd2e39c655..adca9423b2 100644 --- a/modules/openstack_project/manifests/server.pp +++ b/modules/openstack_project/manifests/server.pp @@ -12,6 +12,7 @@ class openstack_project::server ( $ca_server = undef, $afs = false, $puppetmaster_server = 'puppetmaster.openstack.org', + $manage_exim = true, ) { class { 'openstack_project::template': iptables_public_tcp_ports => $iptables_public_tcp_ports, @@ -23,8 +24,7 @@ class openstack_project::server ( ca_server => $ca_server, puppetmaster_server => $puppetmaster_server, afs => $afs, - } - class { 'exim': - sysadmins => $sysadmins, + manage_exim => $manage_exim, + sysadmins => $sysadmins, } }