From: Peter Palfrader Date: Tue, 19 Jun 2012 16:59:50 +0000 (+0200) Subject: Call HOST_DRBD_V4 now HOST_GANETI_BACKEND_V4 X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=2bb51a5d76d106f4ea097f5a075e24a848de5bd5 Call HOST_DRBD_V4 now HOST_GANETI_BACKEND_V4 --- diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb index 9c2debbf..6093e2d7 100644 --- a/modules/ferm/templates/defs.conf.erb +++ b/modules/ferm/templates/defs.conf.erb @@ -165,8 +165,8 @@ dbs.join(' ') %>); -@def $HOST_GANETI_V4 = (206.12.19.213/32 206.12.19.217/32); -@def $HOST_DRBD_V4 = (192.168.2.213/32 192.168.2.217/32); +@def $HOST_GANETI_V4 = (206.12.19.213/32 206.12.19.217/32); +@def $HOST_GANETI_BACKEND_V4 = (192.168.2.213/32 192.168.2.217/32); @def $HOST_DEBIAN = ($HOST_DEBIAN_V4 $HOST_DEBIAN_V6); diff --git a/modules/ganeti2/manifests/init.pp b/modules/ganeti2/manifests/init.pp index 436c0dd4..79a2ba16 100644 --- a/modules/ganeti2/manifests/init.pp +++ b/modules/ganeti2/manifests/init.pp @@ -36,7 +36,7 @@ class ganeti2 { @ferm::rule { 'dsa-drbd-v4': description => 'allow drbd communication', - rule => 'proto tcp mod state state (NEW) dport (11000:11999) @subchain \'drbd\' { saddr ($HOST_DRBD_V4) daddr ($HOST_DRBD_V4) ACCEPT; }', + rule => 'proto tcp mod state state (NEW) dport (11000:11999) @subchain \'drbd\' { saddr ($HOST_GANETI_BACKEND_V4) daddr ($HOST_GANETI_BACKEND_V4) ACCEPT; }', notarule => true, } }