Skip to content
Snippets Groups Projects
Commit 323523b9 authored by Steven Dake's avatar Steven Dake
Browse files

Install lvm in Cinder from-source containers

lvm is required to integrate with Cinder with local storage.
Since local storage is an operation we support, we need this
package whether or not we keep udev sync disabled.

Tested all variants of centos+ubuntu+binary+source in
template and dockerfile format.

Change-Id: Icaeb2eeb588816d2f8a4b57f35fd43ddc56ff269
Partially-Implements: blueprint gate-source-builds
parent 32d48e6f
No related branches found
No related tags found
No related merge requests found
...@@ -4,7 +4,9 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) ...@@ -4,7 +4,9 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
ADD ./cinder.tar / ADD ./cinder.tar /
RUN ln -s /cinder-* /cinder RUN ln -s /cinder-* /cinder
RUN cd /cinder \ RUN yum -y install lvm2 \
&& yum clean all \
&& cd /cinder \
&& useradd --user-group cinder \ && useradd --user-group cinder \
&& pip install -r requirements.txt \ && pip install -r requirements.txt \
&& pip install /cinder \ && pip install /cinder \
......
...@@ -6,6 +6,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) ...@@ -6,6 +6,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install openstack-cinder \ RUN yum -y install openstack-cinder \
python-automaton \ python-automaton \
lvm2 \
&& yum clean all \ && yum clean all \
&& sed -i "s|udev_rules = 1|udev_rules = 0|g" /etc/lvm/lvm.conf \ && 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 && sed -i "s|udev_sync = 1|udev_sync = 0|g" /etc/lvm/lvm.conf
...@@ -20,6 +21,17 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ ...@@ -20,6 +21,17 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
{% endif %} {% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
RUN yum -y install lvm2 \
&& yum clean all
{% elif base_distro in ['ubuntu', 'debian'] %}
RUN apt-get install -y --no-install-recommends lvm2 \
&& apt-get clean
{% endif %}
ADD ./cinder.tar / ADD ./cinder.tar /
RUN ln -s /cinder-* /cinder RUN ln -s /cinder-* /cinder
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment