Merge "Pass exim flag to template rather than exim class"
This commit is contained in:
commit
d7315cbfe0
@ -12,6 +12,7 @@ class openstack_project::server (
|
|||||||
$ca_server = undef,
|
$ca_server = undef,
|
||||||
$afs = false,
|
$afs = false,
|
||||||
$puppetmaster_server = 'puppetmaster.openstack.org',
|
$puppetmaster_server = 'puppetmaster.openstack.org',
|
||||||
|
$manage_exim = true,
|
||||||
) {
|
) {
|
||||||
class { 'openstack_project::template':
|
class { 'openstack_project::template':
|
||||||
iptables_public_tcp_ports => $iptables_public_tcp_ports,
|
iptables_public_tcp_ports => $iptables_public_tcp_ports,
|
||||||
@ -23,8 +24,7 @@ class openstack_project::server (
|
|||||||
ca_server => $ca_server,
|
ca_server => $ca_server,
|
||||||
puppetmaster_server => $puppetmaster_server,
|
puppetmaster_server => $puppetmaster_server,
|
||||||
afs => $afs,
|
afs => $afs,
|
||||||
}
|
manage_exim => $manage_exim,
|
||||||
class { 'exim':
|
sysadmins => $sysadmins,
|
||||||
sysadmins => $sysadmins,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user