diff options
| author | Sam Yaple <sam@yaple.net> | 2015-08-27 09:46:42 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-08-27 11:13:51 +0000 |
| commit | bd98a508bdea32411ac9685bd26d8642154cebd5 (patch) | |
| tree | 42631aa2f3a8d2f177b352005bc3b149a13f06ad /docker_templates | |
| parent | eecf6581a47745d53298c4efa5af6c411afa6260 (diff) | |
| download | kolla-bd98a508bdea32411ac9685bd26d8642154cebd5.tar.gz kolla-bd98a508bdea32411ac9685bd26d8642154cebd5.zip | |
Unify Centos and Ubuntu Source Install - Nova
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: I58708a4e7375f20622c944539a41336333d3bfcb
Partially-Implements: blueprint install-from-ubuntu
Diffstat (limited to 'docker_templates')
| -rw-r--r-- | docker_templates/nova/nova-base/Dockerfile.j2 | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/docker_templates/nova/nova-base/Dockerfile.j2 b/docker_templates/nova/nova-base/Dockerfile.j2 index 8e117e69e..b46a446d4 100644 --- a/docker_templates/nova/nova-base/Dockerfile.j2 +++ b/docker_templates/nova/nova-base/Dockerfile.j2 @@ -39,16 +39,12 @@ RUN apt-get install -y --no-install-recommends \ {% endif %} -ADD ./nova.tar / -RUN ln -s /nova-* /nova - -RUN cd /nova \ +ADD nova.tar / +RUN ln -s /nova-* nova \ && useradd --user-group nova \ - && pip install -r requirements.txt \ - && pip install --install-option="--install-scripts=/usr/bin" /nova \ - && mkdir /etc/nova /var/log/nova /home/nova \ + && pip --no-cache-dir install /nova \ + && mkdir -p /etc/nova /var/log/nova /home/nova \ && cp -r /nova/etc/nova/* /etc/nova/ \ - && chown -R nova: /etc/nova /var/log/nova /home/nova \ - && rm -rf /root/.cache + && chown -R nova: /etc/nova /var/log/nova /home/nova {% endif %} |