From 6664a8d31d0269bbd0ae77784e38da8c70dce0da Mon Sep 17 00:00:00 2001
From: Waldemar Znoinski <waldemar.znoinski@intel.com>
Date: Mon, 12 Sep 2016 16:48:06 +0000
Subject: [PATCH] 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
---
docker/ironic/ironic-inspector/Dockerfile.j2 | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/docker/ironic/ironic-inspector/Dockerfile.j2 b/docker/ironic/ironic-inspector/Dockerfile.j2
index b4ad685fa9..3c79d38159 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 %}