diff options
| author | ZhongShengping <chdzsp@163.com> | 2017-01-04 11:54:56 +0800 |
|---|---|---|
| committer | ZhongShengping <chdzsp@163.com> | 2017-01-05 17:40:15 +0800 |
| commit | f1479c6e22e9ff39b46b90656bbf6159e5837cc3 (patch) | |
| tree | 234cfe6dd628cb848e483d09986e2e1fbe6b12f2 /docker/watcher/watcher-api | |
| parent | 0c96526de81779e2830dc14c30dee203574fcf49 (diff) | |
| download | kolla-f1479c6e22e9ff39b46b90656bbf6159e5837cc3.tar.gz kolla-f1479c6e22e9ff39b46b90656bbf6159e5837cc3.zip | |
Add support for installing binary packages of watcher
Change-Id: I05b80a6c9455bc1faf986e1aa6b92cb6fd80d0fd
Diffstat (limited to 'docker/watcher/watcher-api')
| -rw-r--r-- | docker/watcher/watcher-api/Dockerfile.j2 | 12 |
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 |