openstack/kolla-ansible
Code Issues Proposed changes

Make cinder work by removing udev+lvm integration

Browse Source 
Turn off udev integration in the lvm.conf file in the Cinder
container so logical volumes can be created.

Change-Id: Ida01e9b9c4d530dad1a9d84724623461eda3f84c
Closes-Bug: #1487807
This commit is contained in:
Steven Dake 2015-08-22 18:52:40 -07:00 committed by Sam Yaple
parent 13735a1ec1
commit cd77ce38ac
3 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docker/centos/binary/cinder/cinder-base/Dockerfile
View File

@ -1,4 +1,11 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install openstack-cinder python-automaton && yum clean all
RUN yum -y install openstack-cinder \
python-automaton \
&& sed -i "s|udev_rules = 1|udev_rules = 0|g" /etc/lvm/lvm.conf \
&& sed -i "s|udev_sync = 1|udev_sync = 0|g" /etc/lvm/lvm.conf \
&& yum clean all
# NOTE(sdake): The sed operations make LVM tools work inside a container - see
# https://groups.google.com/forum/#!topic/docker-user/n4Xtvsb4RAw

7
docker/centos/source/cinder/cinder-base/Dockerfile
View File

@ -11,4 +11,9 @@ RUN cd /cinder \
&& mkdir /etc/cinder /var/log/cinder \
&& cp -r /cinder/etc/cinder/* /etc/cinder/ \
&& chown -R cinder: /etc/cinder /var/log/cinder \
&& rm -rf /root/.cache
&& rm -rf /root/.cache \
&& sed -i "s|udev_rules = 1|udev_rules = 0|g" /etc/lvm/lvm.conf \
&& sed -i "s|udev_sync = 1|udev_sync = 0|g" /etc/lvm/lvm.conf
# NOTE(sdake): The sed operations make LVM tools work inside a container - see
# https://groups.google.com/forum/#!topic/docker-user/n4Xtvsb4RAw

14
docker_templates/cinder/cinder-base/Dockerfile.j2
View File

@ -6,7 +6,12 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install openstack-cinder \
python-automaton \
&& yum clean all
&& yum clean all \
&& sed -i "s|udev_rules = 1|udev_rules = 0|g" /etc/lvm/lvm.conf \
&& sed -i "s|udev_sync = 1|udev_sync = 0|g" /etc/lvm/lvm.conf
# NOTE(sdake): The sed operations make LVM tools work inside a container - see
# https://groups.google.com/forum/#!topic/docker-user/n4Xtvsb4RAw
{% elif base_distro in ['ubuntu', 'debian'] %}
@ -26,6 +31,11 @@ RUN cd /cinder \
&& mkdir /etc/cinder /var/log/cinder \
&& cp -r /cinder/etc/cinder/* /etc/cinder/ \
&& chown -R cinder: /etc/cinder /var/log/cinder \
&& rm -rf /root/.cache
&& rm -rf /root/.cache \
&& sed -i "s|udev_rules = 1|udev_rules = 0|g" /etc/lvm/lvm.conf \
&& sed -i "s|udev_sync = 1|udev_sync = 0|g" /etc/lvm/lvm.conf
# NOTE(sdake): The sed operations make LVM tools work inside a container - see
# https://groups.google.com/forum/#!topic/docker-user/n4Xtvsb4RAw
{% endif %}