diff options
| author | Sam Yaple <sam@yaple.net> | 2015-11-20 20:50:01 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-11-20 23:16:16 +0000 |
| commit | 3cd5eec2ec7659c895e71d3eb7055694d59e125d (patch) | |
| tree | c8f6dba14da8b374bb611f8583c729d6dccddcce /docker | |
| parent | 296d17af2d0572cc02c7cbc6d13463d7f7274c90 (diff) | |
| download | kolla-3cd5eec2ec7659c895e71d3eb7055694d59e125d.tar.gz kolla-3cd5eec2ec7659c895e71d3eb7055694d59e125d.zip | |
Fix udev cinder issue
/run/udev contains the udev information needed for the lvm tools
/run and /dev must be bound in for this to work properly
Change-Id: Icfe07c4ce3673310cc24591b42c107c9710cd3ac
Closes-Bug: #1518454
Closes-Bug: #1487780
Related-Bug: #1487807
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/cinder/cinder-base/Dockerfile.j2 | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2 index 3741578f6..a9bb1b2a5 100644 --- a/docker/cinder/cinder-base/Dockerfile.j2 +++ b/docker/cinder/cinder-base/Dockerfile.j2 @@ -9,12 +9,7 @@ RUN yum -y install openstack-cinder \ lvm2 \ ceph-common \ && yum clean all \ - && mkdir -p /etc/ceph \ - && 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 + && mkdir -p /etc/ceph {% endif %} {% elif install_type == 'source' %} @@ -39,11 +34,6 @@ RUN ln -s cinder-base-source/* cinder \ && pip --no-cache-dir install -c requirements/upper-constraints.txt /cinder \ && mkdir -p /etc/cinder /var/log/cinder /home/cinder \ && cp -r /cinder/etc/cinder/* /etc/cinder/ \ - && chown -R cinder: /etc/cinder /var/log/cinder /home/cinder \ - && 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 + && chown -R cinder: /etc/cinder /var/log/cinder /home/cinder {% endif %} |