openstack/kolla-ansible
Code Issues Proposed changes

Merge "Add missing contraints"

Browse Source
This commit is contained in:
Jenkins 2015-12-29 02:37:59 +00:00 committed by Gerrit Code Review
commit beb8b7ddc4
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/murano/murano-base/Dockerfile.j2
View File

@ -11,7 +11,7 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
ADD murano-base-archive /murano-base-source
RUN ln -s murano-base-source/* murano \
&& useradd --user-group murano \
&& /var/lib/kolla/venv/bin/pip --no-cache-dir install /murano \
&& /var/lib/kolla/venv/bin/pip --no-cache-dir install -c requirements/upper-constraints.txt /murano \
&& mkdir -p /etc/murano /var/log/murano /home/murano \
&& cp -r /murano/etc/murano/* /etc/murano/ \
&& chown -R murano: /etc/murano /var/log/murano /home/murano

2
docker/neutron/neutron-base/Dockerfile.j2
View File

@ -39,7 +39,7 @@ RUN apt-get install -y --no-install-recommends \
ADD neutron-base-archive /neutron-base-source
RUN ln -s neutron-base-source/* neutron \
&& useradd --user-group neutron \
&& /var/lib/kolla/venv/bin/pip --no-cache-dir install /neutron \
&& /var/lib/kolla/venv/bin/pip --no-cache-dir install -c requirements/upper-constraints.txt /neutron \
&& mkdir -p /etc/neutron /usr/share/neutron /var/log/neutron /home/neutron \
&& cp -r /neutron/etc/* /etc/neutron/ \
&& cp -r /neutron/etc/neutron/* /etc/neutron/ \

2
docker/nova/nova-base/Dockerfile.j2
View File

@ -39,7 +39,7 @@ RUN apt-get install -y --no-install-recommends \
ADD nova-base-archive /nova-base-source
RUN ln -s nova-base-source/* nova \
&& useradd --user-group nova \
&& /var/lib/kolla/venv/bin/pip --no-cache-dir install /nova \
&& /var/lib/kolla/venv/bin/pip --no-cache-dir install -c requirements/upper-constraints.txt /nova \
&& mkdir -p /etc/nova /var/log/nova /home/nova /var/lib/nova \
&& cp -r /nova/etc/nova/* /etc/nova/ \
&& chown -R nova: /etc/nova /var/log/nova /home/nova /var/lib/nova

2
docker/nova/nova-compute/Dockerfile.j2
View File

@ -34,7 +34,7 @@ RUN apt-get install -y --no-install-recommends \
{% endif %}
RUN /var/lib/kolla/venv/bin/pip install --no-cache-dir libvirt-python
RUN /var/lib/kolla/venv/bin/pip --no-cache-dir install -c requirements/upper-constraints.txt libvirt-python
{% endif %}

2
docker/swift/swift-base/Dockerfile.j2
View File

@ -13,7 +13,7 @@ RUN yum -y install openstack-swift \
ADD swift-base-archive /swift-base-source
RUN ln -s swift-base-source/* swift \
&& useradd --user-group swift \
&& /var/lib/kolla/venv/bin/pip --no-cache-dir install /swift \
&& /var/lib/kolla/venv/bin/pip --no-cache-dir install -c requirements/upper-constraints.txt /swift \
&& mkdir -p /etc/swift /var/log/swift /home/swift \
&& cp -r /swift/etc/* /etc/swift/ \
&& chown -R swift: /etc/swift /var/log/swift /home/swift

2
docker/zaqar/Dockerfile.j2
View File

@ -13,7 +13,7 @@ RUN yum -y install openstack-zaqar \
ADD zaqar-archive /zaqar-source
RUN ln -s zaqar-source/* zaqar \
&& useradd --user-group zaqar \
&& /var/lib/kolla/venv/bin/pip --no-cache-dir install /zaqar \
&& /var/lib/kolla/venv/bin/pip --no-cache-dir install -c requirements/upper-constraints.txt /zaqar \
&& mkdir -p /etc/zaqar /var/log/zaqar /home/zaqar \
&& cp -r /zaqar/etc/* /etc/zaqar/ \
&& chown -R zaqar: /etc/zaqar /var/log/zaqar /home/zaqar