From b3110a86f05f02946c0c36ad43418b78092851e2 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Sun, 27 Jan 2019 16:00:27 +0100 Subject: [PATCH] ganeti2: add wrapper for qemu-system-ppc64 --- modules/ganeti2/files/qemu-system-ppc64-wrapper | 11 +++++++++++ modules/ganeti2/manifests/init.pp | 7 +++++++ 2 files changed, 18 insertions(+) create mode 100755 modules/ganeti2/files/qemu-system-ppc64-wrapper diff --git a/modules/ganeti2/files/qemu-system-ppc64-wrapper b/modules/ganeti2/files/qemu-system-ppc64-wrapper new file mode 100755 index 000000000..415eeb9de --- /dev/null +++ b/modules/ganeti2/files/qemu-system-ppc64-wrapper @@ -0,0 +1,11 @@ +#!/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 1708ba857..3fb944cd9 100644 --- a/modules/ganeti2/manifests/init.pp +++ b/modules/ganeti2/manifests/init.pp @@ -30,6 +30,13 @@ 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', -- 2.20.1