diff --git a/docker/centos/binary/cinder/cinder-base/Dockerfile b/docker/centos/binary/cinder/cinder-base/Dockerfile index b6db65e630..6b699dae5d 100644 --- a/docker/centos/binary/cinder/cinder-base/Dockerfile +++ b/docker/centos/binary/cinder/cinder-base/Dockerfile @@ -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 diff --git a/docker/centos/source/cinder/cinder-base/Dockerfile b/docker/centos/source/cinder/cinder-base/Dockerfile index f07058bb9c..b9486d6b63 100644 --- a/docker/centos/source/cinder/cinder-base/Dockerfile +++ b/docker/centos/source/cinder/cinder-base/Dockerfile @@ -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 diff --git a/docker_templates/cinder/cinder-base/Dockerfile.j2 b/docker_templates/cinder/cinder-base/Dockerfile.j2 index fe899ae44e..e0ed18acbd 100644 --- a/docker_templates/cinder/cinder-base/Dockerfile.j2 +++ b/docker_templates/cinder/cinder-base/Dockerfile.j2 @@ -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 %}