openstack/kolla-ansible
Code Issues Proposed changes

Unify Centos and Ubuntu Source Install - Neutron

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: I5c61a31b0a6d8892350311b4afe8f31c28eb2f7f
Implements: blueprint install-from-ubuntu
This commit is contained in:
Sam Yaple 2015-08-27 18:21:24 +00:00
parent 4da40a0ab9
commit b2c64529ed
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docker_templates/neutron/neutron-base/Dockerfile.j2
View File

@ -31,20 +31,16 @@ RUN apt-get install -y --no-install-recommends \
{% endif %}
ADD ./neutron.tar /
RUN ln -s /neutron-* /neutron
RUN cd /neutron \
ADD neutron.tar /
RUN ln -s /neutron-* neutron \
&& useradd --user-group neutron \
&& pip install -r requirements.txt \
&& pip install --install-option="--install-scripts=/usr/bin" /neutron \
&& pip --no-cache-dir install /neutron \
&& mkdir -p /etc/neutron /usr/share/neutron /var/log/neutron /home/neutron \
&& cp -r etc/* /etc/neutron/ \
&& cp -r etc/neutron/* /etc/neutron/ \
&& cp etc/api-paste.ini /usr/share/neutron \
&& mv /etc/neutron/neutron/ /etc/neutron/plugins/ \
&& chown -R neutron: /etc/neutron /var/log/neutron /home/neutron \
&& rm -rf /root/.cache
&& chown -R neutron: /etc/neutron /usr/share/neutron /var/log/neutron /home/neutron
{% endif %}