Merge "Fix udev cinder issue"

ansible/roles/cinder/tasks/start.yml

@@ -80,6 +80,8 @@
     volumes:
       - "{{ node_config_directory }}/cinder-volume/:{{ container_config_directory }}/:ro"
       - "/var/lib/kolla/dev/log:/dev/log"
+      - /dev/:/dev/
+      - /run/:/run/
     env:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
   when: inventory_hostname in groups['cinder-volume']

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 %}