openstack/kolla-ansible
Code Issues Proposed changes

Unify Centos and Ubuntu Source Install - Swift

Browse Source 
A change merged in the base allows for Centos and Ubuntu to install
all python things to the same locations. This updates the source
section to reflect that change.

Change-Id: Ie6f81d4d1ce8e6d8bc830f0af3c684671df5545f
Partially-Implements: blueprint install-from-ubuntu
This commit is contained in:
Sam Yaple 2015-08-27 10:38:24 +00:00
parent eecf6581a4
commit 8ba0faf633
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
docker_templates/swift/swift-base/Dockerfile.j2
View File

@ -15,16 +15,13 @@ RUN echo '{{ install_type}} not yet available for {{ base_distro }}' \
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
ADD ./swift.tar / ADD swift.tar /
RUN ln -s /swift-* /swift RUN ln -s /swift-* swift \
RUN cd /swift \
&& useradd --user-group swift \ && useradd --user-group swift \
&& pip install -r requirements.txt \ && pip --no-cache-dir install /swift \
&& pip install /swift \ && mkdir -p /etc/swift /var/log/swift /home/swift \
&& mkdir /etc/swift /var/log/swift \
&& cp -r /swift/etc/* /etc/swift/ \ && cp -r /swift/etc/* /etc/swift/ \
&& rm -rf /root/.cache && chown -R swift: /etc/swift /var/log/swift /home/swift
{% endif %} {% endif %}