diff options
| author | Sam Yaple <sam@yaple.net> | 2015-08-27 18:21:24 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-08-27 18:29:54 +0000 |
| commit | b2c64529ed51c910f57636886b24dce25246cd88 (patch) | |
| tree | 4408f41006108f5b4edcbd5b0d505814dfb4e5fd | |
| parent | 4da40a0ab93cd4bc3248031a437c609fb84fb317 (diff) | |
| download | kolla-b2c64529ed51c910f57636886b24dce25246cd88.tar.gz kolla-b2c64529ed51c910f57636886b24dce25246cd88.zip | |
Unify Centos and Ubuntu Source Install - Neutron
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
| -rw-r--r-- | docker_templates/neutron/neutron-base/Dockerfile.j2 | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/docker_templates/neutron/neutron-base/Dockerfile.j2 b/docker_templates/neutron/neutron-base/Dockerfile.j2 index 367d5daae..3e10aff27 100644 --- a/docker_templates/neutron/neutron-base/Dockerfile.j2 +++ b/docker_templates/neutron/neutron-base/Dockerfile.j2 @@ -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 %} |