X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=inline;f=modules%2Fganeti2%2Fmanifests%2Finit.pp;h=3e017b3937c03b34cf0d19b7a5cd8073717ddd07;hb=dd401e461e4a6e250300bede2d3ab65d1193fe62;hp=436c0dd412f30dddcbaf1ca7136d50510fa8a325;hpb=c85c6dc77fcfec881d88a6c8f3457044d714c52e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ganeti2/manifests/init.pp b/modules/ganeti2/manifests/init.pp
index 436c0dd41..3e017b393 100644
--- a/modules/ganeti2/manifests/init.pp
+++ b/modules/ganeti2/manifests/init.pp
@@ -36,7 +36,41 @@ 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,
 	}
+
+	@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'),
+			;
+		'/etc/ganeti/instance-debootstrap/hooks/10-dsa-install-extra-packages':
+			content => template('ganeti2/instance-debootstrap/hooks/10-dsa-install-extra-packages.erb'),
+			;
+		'/etc/ganeti/instance-debootstrap/hooks/20-dsa-install-bootloader':
+			content => template('ganeti2/instance-debootstrap/hooks/20-dsa-install-bootloader.erb'),
+			;
+		'/etc/ganeti/instance-debootstrap/hooks/30-dsa-install-ssh-keys':
+			content => template('ganeti2/instance-debootstrap/hooks/30-dsa-install-ssh-keys.erb'),
+			;
+	}
+
 }