diff options
| author | Zuul <zuul@review.openstack.org> | 2017-10-31 04:48:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-10-31 04:48:31 +0000 |
| commit | 568f131ab6be29b8814ce802535ccceea4e2fd6b (patch) | |
| tree | 583b5c2c8af0fb3fcf5bab9b094a481397449d9b /docker | |
| parent | 48df9f27b04fcb34c4ba3609a6814843183a74cb (diff) | |
| parent | f1b98a4925826333cf22dafe15ef755066c51d48 (diff) | |
| download | kolla-568f131ab6be29b8814ce802535ccceea4e2fd6b.tar.gz kolla-568f131ab6be29b8814ce802535ccceea4e2fd6b.zip | |
Merge "nova-libvirt: fix kvm permission issue"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/nova/nova-libvirt/extend_start.sh | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/docker/nova/nova-libvirt/extend_start.sh b/docker/nova/nova-libvirt/extend_start.sh index a0ccf18de..fe33b6c63 100644 --- a/docker/nova/nova-libvirt/extend_start.sh +++ b/docker/nova/nova-libvirt/extend_start.sh @@ -4,8 +4,17 @@ # Fix permissions for libvirt # Do not remove unless CentOS has been validated if [[ -c /dev/kvm ]]; then - chmod 660 /dev/kvm - chown root:qemu /dev/kvm + 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 fi # Mount xenfs for libxl to work |