Only do the ferm stuff for cluster ganeti2.d.o

diff --git a/modules/ganeti2/manifests/init.pp b/modules/ganeti2/manifests/init.pp
index 4838bac3129e3ca865d11a08f2974e9e5f65446c..b2645602d5aedfaad9d3cca60957b7e3f9eb00fa 100644 (file)
--- a/modules/ganeti2/manifests/init.pp
+++ b/modules/ganeti2/manifests/init.pp
@@ -4,10 +4,6 @@ class ganeti2 {
                ensure => installed
        }
 
-       package { 'drbd8-utils':
-               ensure => installed
-       }
-
        package { 'ganeti-instance-debootstrap':
                ensure => installed
        }
@@ -16,40 +12,48 @@ class ganeti2 {
                ensure => installed
        }
 
-       @ferm::rule { 'dsa-ganeti-noded-v4':
-               description => 'allow ganeti-noded communication',
-               rule        => 'proto tcp mod state state (NEW) dport (1811) @subchain \'ganeti-noded\' { saddr ($HOST_GANETI_V4) daddr ($HOST_GANETI_V4) ACCEPT; }',
-               notarule    => true,
-       }
+       case $::cluster {
+               ganeti2.debian.org: {
+                       package { 'drbd8-utils':
+                               ensure => installed
+                       }
 
-       @ferm::rule { 'dsa-ganeti-confd-v4':
-               description => 'allow ganeti-confd communication',
-               rule        => 'proto udp mod state state (NEW) dport (1814) @subchain \'ganeti-confd\' { saddr ($HOST_GANETI_V4) daddr ($HOST_GANETI_V4) ACCEPT; }',
-               notarule    => true,
-       }
+                       @ferm::rule { 'dsa-ganeti-noded-v4':
+                               description => 'allow ganeti-noded communication',
+                               rule        => 'proto tcp mod state state (NEW) dport (1811) @subchain \'ganeti-noded\' { saddr ($HOST_GANETI_V4) daddr ($HOST_GANETI_V4) ACCEPT; }',
+                               notarule    => true,
+                       }
 
-       @ferm::rule { 'dsa-ganeti-rapi-v4':
-               description => 'allow ganeti-rapi communication',
-               rule        => 'proto tcp mod state state (NEW) dport (5080) @subchain \'ganeti-rapi\' { saddr ($HOST_GANETI_V4) daddr ($HOST_GANETI_V4) ACCEPT; }',
-               notarule    => true,
-       }
+                       @ferm::rule { 'dsa-ganeti-confd-v4':
+                               description => 'allow ganeti-confd communication',
+                               rule        => 'proto udp mod state state (NEW) dport (1814) @subchain \'ganeti-confd\' { saddr ($HOST_GANETI_V4) daddr ($HOST_GANETI_V4) ACCEPT; }',
+                               notarule    => true,
+                       }
 
-       @ferm::rule { 'dsa-ganeti-drbd-v4':
-               description => 'allow ganeti drbd communication',
-               rule        => 'proto tcp mod state state (NEW) dport (11000:11999) @subchain \'ganeti-drbd\' { saddr ($HOST_GANETI_BACKEND_V4) daddr ($HOST_GANETI_BACKEND_V4) ACCEPT; }',
-               notarule    => true,
-       }
+                       @ferm::rule { 'dsa-ganeti-rapi-v4':
+                               description => 'allow ganeti-rapi communication',
+                               rule        => 'proto tcp mod state state (NEW) dport (5080) @subchain \'ganeti-rapi\' { saddr ($HOST_GANETI_V4) daddr ($HOST_GANETI_V4) ACCEPT; }',
+                               notarule    => true,
+                       }
 
-       @ferm::rule { 'dsa-ganeti-kvm-migration-v4':
-               description => 'allow ganeti kvm migration ',
-               rule        => 'proto tcp dport 8102 @subchain \'ganeti-kvm-migration\' { saddr ($HOST_GANETI_BACKEND_V4) daddr ($HOST_GANETI_BACKEND_V4) ACCEPT; }',
-               notarule    => true,
-       }
+                       @ferm::rule { 'dsa-ganeti-drbd-v4':
+                               description => 'allow ganeti drbd communication',
+                               rule        => 'proto tcp mod state state (NEW) dport (11000:11999) @subchain \'ganeti-drbd\' { saddr ($HOST_GANETI_BACKEND_V4) daddr ($HOST_GANETI_BACKEND_V4) ACCEPT; }',
+                               notarule    => true,
+                       }
+
+                       @ferm::rule { 'dsa-ganeti-kvm-migration-v4':
+                               description => 'allow ganeti kvm migration ',
+                               rule        => 'proto tcp dport 8102 @subchain \'ganeti-kvm-migration\' { saddr ($HOST_GANETI_BACKEND_V4) daddr ($HOST_GANETI_BACKEND_V4) ACCEPT; }',
+                               notarule    => true,
+                       }
 
-       @ferm::rule { 'dsa-ganeti-ssh-v4':
-               description => 'allow ganeti to ssh around',
-               rule        => 'proto tcp dport ssh @subchain \'ganeti-ssh\' { saddr ( $HOST_GANETI_V4 $HOST_GANETI_BACKEND_V4) ACCEPT; }',
-               notarule    => true,
+                       @ferm::rule { 'dsa-ganeti-ssh-v4':
+                               description => 'allow ganeti to ssh around',
+                               rule        => 'proto tcp dport ssh @subchain \'ganeti-ssh\' { saddr ( $HOST_GANETI_V4 $HOST_GANETI_BACKEND_V4) ACCEPT; }',
+                               notarule    => true,
+                       }
+               }
        }
 
        file {