diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-27 19:27:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-27 19:27:42 +0000 |
| commit | 61550cefac7c6cdc035b8f5f7becdab85035d957 (patch) | |
| tree | bd21a573a71691fbf264eb4419297a84218ee8e5 /docker/nova | |
| parent | f294b5ce2918779e130c76a54252b21f8d32f6e7 (diff) | |
| parent | febcb600f122dc644f8a05c4a7697a39e9157834 (diff) | |
| download | kolla-61550cefac7c6cdc035b8f5f7becdab85035d957.tar.gz kolla-61550cefac7c6cdc035b8f5f7becdab85035d957.zip | |
Merge "Source installation in virtualenv"
Diffstat (limited to 'docker/nova')
| -rw-r--r-- | docker/nova/nova-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2 index baeda4025..4b2fea8b4 100644 --- a/docker/nova/nova-base/Dockerfile.j2 +++ b/docker/nova/nova-base/Dockerfile.j2 @@ -36,7 +36,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 \ - && pip --no-cache-dir install /nova \ + && /var/lib/kolla/venv/bin/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 diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index 41b2e0183..90dd8de2e 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -15,9 +15,8 @@ RUN yum -y install \ {% elif install_type == 'source' %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} -RUN pip uninstall -y requests \ - && yum -y install \ - libvirt-python \ +RUN yum -y install \ + libvirt-devel \ openvswitch \ qemu-img \ sysfsutils \ @@ -27,12 +26,16 @@ RUN pip uninstall -y requests \ {% elif base_distro in ['ubuntu', 'debian'] %} RUN apt-get install -y --no-install-recommends \ + libvirt-dev \ qemu-utils \ ceph-common \ && apt-get clean \ && mkdir -p /etc/ceph {% endif %} + +RUN /var/lib/kolla/venv/bin/pip install --no-cache-dir libvirt-python + {% endif %} {{ include_footer }} |