diff options
| author | Steven Dake <stdake@cisco.com> | 2015-08-22 18:52:40 -0700 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-08-24 16:00:25 +0000 |
| commit | cd77ce38ac04beeda3c62806311d5647250c5651 (patch) | |
| tree | 6931d6b28a5eb8e4ed857699b38982e403825544 | |
| parent | 13735a1ec164defeb93366d9c7a53b2b18e3f6ae (diff) | |
| download | kolla-cd77ce38ac04beeda3c62806311d5647250c5651.tar.gz kolla-cd77ce38ac04beeda3c62806311d5647250c5651.zip | |
Make cinder work by removing udev+lvm integration
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
| -rw-r--r-- | docker/centos/binary/cinder/cinder-base/Dockerfile | 9 | ||||
| -rw-r--r-- | docker/centos/source/cinder/cinder-base/Dockerfile | 7 | ||||
| -rw-r--r-- | docker_templates/cinder/cinder-base/Dockerfile.j2 | 14 |
3 files changed, 26 insertions, 4 deletions
diff --git a/docker/centos/binary/cinder/cinder-base/Dockerfile b/docker/centos/binary/cinder/cinder-base/Dockerfile index b6db65e63..6b699dae5 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 f07058bb9..b9486d6b6 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 fe899ae44..e0ed18acb 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 %} |