From 14cda91c4ef7020ac43f430869798387de15dae4 Mon Sep 17 00:00:00 2001
From: Xinliang Liu <xinliang.liu@linaro.org>
Date: Wed, 6 Dec 2017 14:23:58 +0800
Subject: [PATCH] Revert "nova-libvirt: fix kvm permission issue"

This is not needed. If we make sure qemu use nova user.
Because nova user in group qemu.

See comment #7 of bug #1715356:
The root cause for this issue is that qemu not run with nova user on
debian.
If we set qemu running with nova user with this patch:
https://review.openstack.org/#/c/525891/
Then we need to revert commit f1b98a4925826333cf22dafe15ef755066c51d48.

This reverts commit f1b98a4925826333cf22dafe15ef755066c51d48.
Closes-bug: #1715356
Depends-on: I36720af0c7d3dd7c69d2404843f54c0991aea1bb

Change-Id: I62fbcf9e4ee5c3170c96576698f4ae8b66db1b74
---
 docker/nova/nova-libvirt/extend_start.sh | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/docker/nova/nova-libvirt/extend_start.sh b/docker/nova/nova-libvirt/extend_start.sh
index fe33b6c636..a0ccf18de9 100644
--- a/docker/nova/nova-libvirt/extend_start.sh
+++ b/docker/nova/nova-libvirt/extend_start.sh
@@ -4,17 +4,8 @@
 # Fix permissions for libvirt
 # Do not remove unless CentOS has been validated
 if [[ -c /dev/kvm ]]; then
-    if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then
-        chmod 660 /dev/kvm
-        if [[ "$(uname -m)" == "aarch64" ]]; then
-            chown root:kvm /dev/kvm
-        else
-            chown root:qemu /dev/kvm
-        fi
-    else
-        chmod 666 /dev/kvm
-        chown root:kvm /dev/kvm
-    fi
+    chmod 660 /dev/kvm
+    chown root:qemu /dev/kvm
 fi
 
 # Mount xenfs for libxl to work