From 6ccc13606ca082bac9e40fff48e0e1e1ed9edc7e Mon Sep 17 00:00:00 2001
From: Vitaliy Filippov <vitalif@yourcmc.ru>
Date: Mon, 16 Mar 2020 13:49:27 +0300
Subject: [PATCH] qemu 4.x

---
 README.md            | 5 +++--
 etc/apt/preferences  | 7 +++++++
 etc/apt/sources.list | 4 ++--
 etc/rc.local.env     | 1 +
 general.sh           | 3 +++
 opennebula.sh        | 2 +-
 6 files changed, 17 insertions(+), 5 deletions(-)
 create mode 100644 etc/apt/preferences

diff --git a/README.md b/README.md
index 9cdf810..fd40a6e 100644
--- a/README.md
+++ b/README.md
@@ -12,10 +12,11 @@
 ## TODO
 
 + Вынести в отдельный скрипт настройку ssh-ключей на нодах
++ ethtool -C eth10g rx-usecs 0
 - sensors & sensors-exporter
-- systemctl mask emergency.service, systemctl mask emergency.target
++ systemctl mask emergency.service, systemctl mask emergency.target
 - Убрать quiet из опций GRUB
-- На все ноды поставить qemu 4.x из sid (там virtio-blk discard=unmap умеет)
++ На все ноды поставить qemu 4.x из sid (там virtio-blk discard=unmap умеет)
 - Везде прописать все ноды в /etc/hosts
 - Переименовать сеть в eth1gX + eth10gX (X=1,2), иначе имена сетевых интерфейсов едут при перестановке NVMe-шек
 - Везде убрать DHCP
diff --git a/etc/apt/preferences b/etc/apt/preferences
new file mode 100644
index 0000000..df75dea
--- /dev/null
+++ b/etc/apt/preferences
@@ -0,0 +1,7 @@
+Package: *
+Pin: release a=unstable
+Pin-Priority: 50
+
+Package: qemu* ipxe-qemu
+Pin: release a=unstable
+Pin-Priority: 500
diff --git a/etc/apt/sources.list b/etc/apt/sources.list
index 95ceef7..3348cf0 100644
--- a/etc/apt/sources.list
+++ b/etc/apt/sources.list
@@ -1,5 +1,5 @@
-#deb http://http.debian.net/debian/ sid main contrib non-free
-#deb-src http://http.debian.net/debian/ sid main contrib non-free
+deb http://http.debian.net/debian/ sid main contrib non-free
+deb-src http://http.debian.net/debian/ sid main contrib non-free
 
 deb http://http.debian.net/debian/ stretch main contrib non-free
 deb-src http://http.debian.net/debian/ stretch main contrib non-free
diff --git a/etc/rc.local.env b/etc/rc.local.env
index 75a3541..3137a5b 100755
--- a/etc/rc.local.env
+++ b/etc/rc.local.env
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 cpupower frequency-set -g performance
+ethtool -C $eth10g rx-usecs 0
 ethtool -K $eth10g gro off gso off tso off lro off sg off
 ip l set $eth10g mtu 9000
 exit 0
diff --git a/general.sh b/general.sh
index cdd1cab..d02d01a 100755
--- a/general.sh
+++ b/general.sh
@@ -29,6 +29,9 @@ hostname \`cat /etc/hostname\`
 
 systemctl enable systemd-timesyncd && systemctl restart systemd-timesyncd
 
+systemctl mask emergency.service
+systemctl mask emergency.target
+
 apt-get update || true
 
 # gpg and friends for apt-key to work correctly
diff --git a/opennebula.sh b/opennebula.sh
index cb0e2f1..3b74a72 100755
--- a/opennebula.sh
+++ b/opennebula.sh
@@ -33,7 +33,7 @@ apt-get update || true
 
 DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::="--force-confdef" \
     -o Dpkg::Options::="--force-confold" install -y \
-    lsb-release keepalived sudo qemu-kvm qemu-block-extra mariadb-server netcat-openbsd \
+    lsb-release keepalived sudo qemu qemu-kvm qemu-block-extra mariadb-server netcat-openbsd \
     opennebula opennebula-sunstone opennebula-gate opennebula-flow opennebula-node opennebula-tools ceph
 
 /usr/share/one/install_gems --yes