X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fganeti2%2Fmanifests%2Finit.pp;h=6cc0763ad3ce46fa9db42fd7bc1891445ed72ab8;hb=a7b6008d7ac034afe219b4efe8ac069d331c25ad;hp=3605b583e9cb82b5598d87493cfaa37ed871ca2c;hpb=83f14aaf89b77bb64cac65f9c455062bd3fc4c74;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ganeti2/manifests/init.pp b/modules/ganeti2/manifests/init.pp
index 3605b583e..6cc0763ad 100644
--- a/modules/ganeti2/manifests/init.pp
+++ b/modules/ganeti2/manifests/init.pp
@@ -16,15 +16,69 @@ class ganeti2 {
 		ensure => installed
 	}
 
-	@ferm::rule { 'dsa-ganeti-v4':
-		description => 'Allow ganeti from ganeti master',
-		rule        => 'proto tcp mod state state (NEW) dport (1811) @subchain \'ganeti\' { saddr ($HOST_GANETI_V4) ACCEPT; }',
+	@ferm::rule { 'dsa-ganeti-noded-v4':
+		description => 'allow ganeti-noded communication between',
+		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-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-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-drbd-v4':
-		description => 'Allow ganeti from ganeti master',
-		rule        => 'proto tcp mod state state (NEW) dport (11000:11999) @subchain \'drbd\' { saddr ($HOST_DRBD_V4) daddr ($HOST_DRBD_V4) ACCEPT; }',
+		description => 'allow drbd communication',
+		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,
 	}
+
+	@ferm::rule { 'dsa-ganeti-migrate':
+		description => 'allow kvm to migrate instances',
+		rule        => 'proto tcp dport 8102 @subchain \'ganeti-migrate\' { saddr ($HOST_GANETI_BACKEND_V4) daddr ($HOST_GANETI_BACKEND_V4) ACCEPT; }',
+		notarule    => true,
+	}
+
+	@ferm::rule { 'dsa-ganeti-ssh':
+		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 {
+		'/etc/ganeti/instance-debootstrap/variants.list':
+			content => template('ganeti2/instance-debootstrap/variants.list.erb'),
+			;
+		'/etc/ganeti/instance-debootstrap/variants/dsa.conf':
+			content => template('ganeti2/instance-debootstrap/variants/dsa.conf.erb'),
+			;
+		'/etc/ganeti/instance-debootstrap/hooks/00-dsa-configure-networking':
+			content => template('ganeti2/instance-debootstrap/hooks/00-dsa-configure-networking.erb'),
+			mode   => '0555',
+			;
+		'/etc/ganeti/instance-debootstrap/hooks/10-dsa-install-extra-packages':
+			content => template('ganeti2/instance-debootstrap/hooks/10-dsa-install-extra-packages.erb'),
+			mode   => '0555',
+			;
+		'/etc/ganeti/instance-debootstrap/hooks/20-dsa-install-bootloader':
+			content => template('ganeti2/instance-debootstrap/hooks/20-dsa-install-bootloader.erb'),
+			mode   => '0555',
+			;
+		'/etc/ganeti/instance-debootstrap/hooks/30-dsa-install-ssh-keys':
+			content => template('ganeti2/instance-debootstrap/hooks/30-dsa-install-ssh-keys.erb'),
+			mode   => '0555',
+			;
+		'/etc/ganeti/instance-debootstrap/hooks/40-dsa-setup-swapfile':
+			content => template('ganeti2/instance-debootstrap/hooks/40-dsa-setup-swapfile.erb'),
+			mode   => '0555',
+			;
+	}
+
 }