Fix cinder create volume from image with kolla source build
After recent drop root changes, all cinder rootwrap calls will fail in source build because lack of sudoer setting. This change adds sudoer file to enable rootwrap. It also add missing package dependencies needed for volume from image in source build type. Change-Id: I63a2405fb962ac687cdd88c81e1cdc02b3da638d Closes-Bug: #1536514
This commit is contained in:
parent
2504f55038
commit
f92151465b
@ -17,13 +17,16 @@ RUN yum -y install openstack-cinder \
|
|||||||
{% elif install_type == 'source' %}
|
{% elif install_type == 'source' %}
|
||||||
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
|
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
|
||||||
|
|
||||||
RUN yum -y install lvm2 \
|
RUN yum -y install \
|
||||||
|
lvm2 \
|
||||||
|
qemu-img \
|
||||||
&& yum clean all
|
&& yum clean all
|
||||||
|
|
||||||
{% elif base_distro in ['ubuntu', 'debian'] %}
|
{% elif base_distro in ['ubuntu', 'debian'] %}
|
||||||
|
|
||||||
RUN apt-get install -y --no-install-recommends \
|
RUN apt-get install -y --no-install-recommends \
|
||||||
lvm2 \
|
lvm2 \
|
||||||
|
qemu-utils \
|
||||||
ceph-common \
|
ceph-common \
|
||||||
&& apt-get clean \
|
&& apt-get clean \
|
||||||
&& mkdir -p /etc/ceph
|
&& mkdir -p /etc/ceph
|
||||||
@ -38,6 +41,10 @@ RUN ln -s cinder-base-source/* cinder \
|
|||||||
&& cp -r /cinder/etc/cinder/* /etc/cinder/ \
|
&& cp -r /cinder/etc/cinder/* /etc/cinder/ \
|
||||||
&& chown -R cinder: /etc/cinder /var/log/cinder /var/lib/cinder /home/cinder
|
&& chown -R cinder: /etc/cinder /var/log/cinder /var/lib/cinder /home/cinder
|
||||||
|
|
||||||
|
COPY cinder_sudoers /etc/sudoers.d/cinder_sudoers
|
||||||
|
RUN chmod 750 /etc/sudoers.d \
|
||||||
|
&& chmod 440 /etc/sudoers.d/cinder_sudoers
|
||||||
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
RUN usermod -a -G kolla cinder
|
RUN usermod -a -G kolla cinder
|
||||||
|
1
docker/cinder/cinder-base/cinder_sudoers
Normal file
1
docker/cinder/cinder-base/cinder_sudoers
Normal file
@ -0,0 +1 @@
|
|||||||
|
cinder ALL = (root) NOPASSWD: /var/lib/kolla/venv/bin/cinder-rootwrap /etc/cinder/rootwrap.conf *
|
Loading…
Reference in New Issue
Block a user