diff options
| author | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2016-04-08 23:42:59 +0800 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2016-04-08 15:53:28 -0400 |
| commit | ad1461f46d730ed0393ffcb16b866ed2e0f34943 (patch) | |
| tree | 337efbcc4d4629e6274ce51b4c54845752fed431 /docker/nova/nova-libvirt | |
| parent | fda9444ea63ec436e7598ebb4ce221db0dd5d97d (diff) | |
| download | kolla-ad1461f46d730ed0393ffcb16b866ed2e0f34943.tar.gz kolla-ad1461f46d730ed0393ffcb16b866ed2e0f34943.zip | |
Fix the qemu has nova permission in nova instances folder
Fix the permission issue on different distro
* In CentOS, add the qemu to nova group in CentOS
* In Ubuntu, add the nova to libvirtd group
Co-Authored-By: Steven Dake <stdake@cisco.com>
Change-Id: I1f4f9ce29abf0d788965fe94d8918b10a7169a75
Closes-Bug: #1568012
Diffstat (limited to 'docker/nova/nova-libvirt')
| -rw-r--r-- | docker/nova/nova-libvirt/Dockerfile.j2 | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index 028d4635a..d639408a6 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} MAINTAINER {{ maintainer }} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} @@ -11,7 +11,9 @@ RUN yum -y install \ libvirt-daemon-config-nwfilter \ libvirt-daemon-driver-lxc \ ceph-common \ - && yum clean all + && yum clean all \ + && usermod -a -G nova qemu + {% elif base_distro in ['ubuntu', 'debian'] %} @@ -27,12 +29,12 @@ RUN apt-get install -y --no-install-recommends \ && apt-get clean \ && mkdir -p /etc/ceph \ && rm /etc/libvirt/qemu/networks/default.xml /etc/libvirt/qemu/networks/autostart/default.xml \ - && sed -i 's|.*stdio_handler.*|stdio_handler = "file"|' /etc/libvirt/qemu.conf + && sed -i 's|.*stdio_handler.*|stdio_handler = "file"|' /etc/libvirt/qemu.conf \ + && usermod -a -G libvirtd nova {% endif %} COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN chmod 755 /usr/local/bin/kolla_extend_start \ - && useradd --user-group nova +RUN chmod 755 /usr/local/bin/kolla_extend_start {{ include_footer }} |