From: Aurelien Jarno <aurelien@aurel32.net>
Date: Sun, 3 Feb 2019 00:09:55 +0000 (+0100)
Subject: ganeti2: remove qemu-system-ppc64 wrapper
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=06dfef3de1f760360c8cfb573220ec5c1625f48a;p=mirror%2Fdsa-puppet.git

ganeti2: remove qemu-system-ppc64 wrapper

The wrapper ended-up simpler than on arm64, therefore kvm_extra can be
used instead.
---

diff --git a/modules/ganeti2/files/qemu-system-ppc64-wrapper b/modules/ganeti2/files/qemu-system-ppc64-wrapper
deleted file mode 100755
index 415eeb9de..000000000
--- a/modules/ganeti2/files/qemu-system-ppc64-wrapper
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-# We want to always enable KVM. Contrary to what the Ganeti's documentation
-# says, enabling kvm_flag is not enough.
-
-exec /usr/bin/qemu-system-ppc64 -enable-kvm "$@"
diff --git a/modules/ganeti2/manifests/init.pp b/modules/ganeti2/manifests/init.pp
index 3fb944cd9..1708ba857 100644
--- a/modules/ganeti2/manifests/init.pp
+++ b/modules/ganeti2/manifests/init.pp
@@ -30,13 +30,6 @@ class ganeti2 {
 			mode   => '0555',
 		}
 	}
-	if $::debarchitecture == 'ppc64el' {
-		file { '/usr/local/bin/qemu-system-ppc64-wrapper':
-			source => 'puppet:///modules/ganeti2/qemu-system-ppc64-wrapper',
-			mode   => '0555',
-		}
-	}
-
 	if $::cluster == 'ganeti.bm.debian.org' {
 		file { '/usr/local/sbin/crazy-multipath-restart':
 			source => 'puppet:///modules/ganeti2/crazy-multipath-restart',