aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2017-12-13 13:10:55 +0000
committerGerrit Code Review <review@openstack.org>2017-12-13 13:10:55 +0000
commitabbc589e6aab7806be8be2d26d610ffb586063eb (patch)
treeecd20ac367f8291cf892662b328b9a6a760d9f1a
parent3e4f18137111d5cbabf4d52b241b7a7feea5851b (diff)
parent14cda91c4ef7020ac43f430869798387de15dae4 (diff)
downloadkolla-abbc589e6aab7806be8be2d26d610ffb586063eb.tar.gz
kolla-abbc589e6aab7806be8be2d26d610ffb586063eb.zip
Merge "Revert "nova-libvirt: fix kvm permission issue""
-rw-r--r--docker/nova/nova-libvirt/extend_start.sh13
1 files changed, 2 insertions, 11 deletions
diff --git a/docker/nova/nova-libvirt/extend_start.sh b/docker/nova/nova-libvirt/extend_start.sh
index fe33b6c63..a0ccf18de 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