summaryrefslogtreecommitdiff
path: root/manifests/rules/libvirt/host.pp
diff options
context:
space:
mode:
authorkwadronaut <kwadronaut@leap.se>2018-11-09 10:03:32 +0100
committerkwadronaut <kwadronaut@leap.se>2018-11-09 10:03:32 +0100
commit74ebf6e34723573a23bf0e758978fb3969e362f8 (patch)
tree6abed2eb699e572c418d25d9969b2f4b083a83c0 /manifests/rules/libvirt/host.pp
parent06e89ed3486916ae12186e46b8ec59c8c7c79142 (diff)
parentcabbf434c1778cb4e8fe2f7f726a012f707cd2a5 (diff)
Merge remote-tracking branch 'shared/master'HEADmaster
Diffstat (limited to 'manifests/rules/libvirt/host.pp')
-rw-r--r--manifests/rules/libvirt/host.pp19
1 files changed, 2 insertions, 17 deletions
diff --git a/manifests/rules/libvirt/host.pp b/manifests/rules/libvirt/host.pp
index dc3970d..090a9ca 100644
--- a/manifests/rules/libvirt/host.pp
+++ b/manifests/rules/libvirt/host.pp
@@ -6,21 +6,6 @@ class shorewall::rules::libvirt::host (
$vmz_iface = 'virbr0',
) {
- define shorewall::rule::accept::from_vmz (
- $proto = '-',
- $destinationport = '-',
- $action = 'ACCEPT'
- ) {
- shorewall::rule { $name:
- source => $shorewall::rules::libvirt::host::vmz,
- destination => '$FW',
- order => 300,
- proto => $proto,
- destinationport => $destinationport,
- action => $action;
- }
- }
-
shorewall::policy {
'fw-to-vmz':
sourcezone => '$FW',
@@ -40,7 +25,7 @@ class shorewall::rules::libvirt::host (
order => 800;
}
- shorewall::rule::accept::from_vmz {
+ shorewall::rules::libvirt::host::from_vmz {
'accept_dns_from_vmz':
action => 'DNS(ACCEPT)';
'accept_tftp_from_vmz':
@@ -62,7 +47,7 @@ class shorewall::rules::libvirt::host (
}
if $debproxy_port {
- shorewall::rule::accept::from_vmz { 'accept_debproxy_from_vmz':
+ shorewall::rules::libvirt::host::from_vmz { 'accept_debproxy_from_vmz':
proto => 'tcp',
destinationport => $debproxy_port,
action => 'ACCEPT';