diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-16 18:51:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-16 18:51:31 +0000 |
| commit | c3048f54bdd19c31b5cc9444878540ae59f5f25a (patch) | |
| tree | d216f13159bb20e14441d209326eb4ddd255d980 /docker | |
| parent | 74b75d82455481217b8d3e89e96e36f569e30658 (diff) | |
| parent | 6664a8d31d0269bbd0ae77784e38da8c70dce0da (diff) | |
| download | kolla-c3048f54bdd19c31b5cc9444878540ae59f5f25a.tar.gz kolla-c3048f54bdd19c31b5cc9444878540ae59f5f25a.zip | |
Merge "install ironic-inspector during image build"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ironic/ironic-inspector/Dockerfile.j2 | 5 |
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 %} |