aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Znoinski <waldemar.znoinski@intel.com>2016-09-12 16:48:06 +0000
committerWaldemar Znoinski <waldemar.znoinski@intel.com>2016-09-16 14:03:41 +0000
commit6664a8d31d0269bbd0ae77784e38da8c70dce0da (patch)
tree586e0943a391619e069d51bf8c5a9b5ba99547c7
parentf9956f2e103d8e95720b8312e6fdca18182d69a3 (diff)
downloadkolla-6664a8d31d0269bbd0ae77784e38da8c70dce0da.tar.gz
kolla-6664a8d31d0269bbd0ae77784e38da8c70dce0da.zip
install ironic-inspector during image build
Add installation of ironic-inspector package on binary ubuntu or via pip on any source type of installations. Change-Id: I5946369b6424c32e0cbf00a6590d41eb85b1de18 Closes-bug: #1565936
-rw-r--r--docker/ironic/ironic-inspector/Dockerfile.j25
1 files changed, 5 insertions, 0 deletions
diff --git a/docker/ironic/ironic-inspector/Dockerfile.j2 b/docker/ironic/ironic-inspector/Dockerfile.j2
index b4ad685fa..3c79d3815 100644
--- a/docker/ironic/ironic-inspector/Dockerfile.j2
+++ b/docker/ironic/ironic-inspector/Dockerfile.j2
@@ -8,10 +8,15 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
{% set ironic_inspector_packages = ['openstack-ironic-inspector'] %}
+ {% elif base_distro in ['ubuntu'] %}
+ {% set ironic_base_packages = ['ironic-inspector'] %}
{% endif %}
{{ macros.install_packages(ironic_inspector_packages | customizable("packages")) }}
+{% elif install_type == 'source' %}
+RUN /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt \
+ ironic-inspector
{% endif %}
{% block ironic_inspector_footer %}{% endblock %}