aboutsummaryrefslogtreecommitdiff
path: root/docker/watcher/watcher-api
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-01-05 18:46:53 +0000
committerGerrit Code Review <review@openstack.org>2017-01-05 18:46:53 +0000
commit71781b7b434b11e4b6b745dc45ba9a83b6b8e1f5 (patch)
treee5ad7395d90579c41f67fc4a88a4b503c51b1a74 /docker/watcher/watcher-api
parent7ec65d6fcc3cf7c28eaf05e9ec3ce40542d4efcb (diff)
parentf1479c6e22e9ff39b46b90656bbf6159e5837cc3 (diff)
downloadkolla-71781b7b434b11e4b6b745dc45ba9a83b6b8e1f5.tar.gz
kolla-71781b7b434b11e4b6b745dc45ba9a83b6b8e1f5.zip
Merge "Add support for installing binary packages of watcher"
Diffstat (limited to 'docker/watcher/watcher-api')
-rw-r--r--docker/watcher/watcher-api/Dockerfile.j212
1 files changed, 8 insertions, 4 deletions
diff --git a/docker/watcher/watcher-api/Dockerfile.j2 b/docker/watcher/watcher-api/Dockerfile.j2
index 03fc31c28..a133b380d 100644
--- a/docker/watcher/watcher-api/Dockerfile.j2
+++ b/docker/watcher/watcher-api/Dockerfile.j2
@@ -3,11 +3,15 @@ MAINTAINER {{ maintainer }}
{% block watcher_api_header %}{% endblock %}
-{% if install_type == 'binary' %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
- && /bin/false
+{% import "macros.j2" as macros with context %}
+{% if install_type == 'binary' %}
+ {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+ {% set watcher_api_packages = ['openstack-watcher-api'] %}
+ {% elif base_distro in ['ubuntu'] %}
+ {% set watcher_api_packages = ['watcher-api'] %}
+ {% endif %}
+{{ macros.install_packages(watcher_api_packages | customizable("packages")) }}
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_watcher_extend_start