diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-24 17:18:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-24 17:18:05 +0000 |
| commit | 3a8157211251787b9c1941c698ec13e427106e3e (patch) | |
| tree | e15901e498f2ffbe2e9a439eeb0974d36b5c246c | |
| parent | 42c8fec79c9e180f517ffc334a758873287ff560 (diff) | |
| parent | 3cd5eec2ec7659c895e71d3eb7055694d59e125d (diff) | |
| download | kolla-3a8157211251787b9c1941c698ec13e427106e3e.tar.gz kolla-3a8157211251787b9c1941c698ec13e427106e3e.zip | |
Merge "Fix udev cinder issue"
| -rw-r--r-- | ansible/roles/cinder/tasks/start.yml | 2 | ||||
| -rw-r--r-- | docker/cinder/cinder-base/Dockerfile.j2 | 14 |
2 files changed, 4 insertions, 12 deletions
diff --git a/ansible/roles/cinder/tasks/start.yml b/ansible/roles/cinder/tasks/start.yml index 5c30315ef..d7d16df8b 100644 --- a/ansible/roles/cinder/tasks/start.yml +++ b/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'] diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2 index 5016f0fe7..105e46d54 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 %} |