diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-04-09 03:32:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-04-09 03:32:55 +0000 |
| commit | c872a426a9a7743ad70aa708e4548997a720aba3 (patch) | |
| tree | e6ddc7a37f508683c0462b10cef41662e530158b /docker/nova/nova-libvirt | |
| parent | 6eb333352811ad272aa6661d5d370f23e0f3a184 (diff) | |
| parent | ad1461f46d730ed0393ffcb16b866ed2e0f34943 (diff) | |
| download | kolla-c872a426a9a7743ad70aa708e4548997a720aba3.tar.gz kolla-c872a426a9a7743ad70aa708e4548997a720aba3.zip | |
Merge "Fix the qemu has nova permission in nova instances folder"
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 }} |