openstack/kolla
Code Issues Proposed changes

Add support for installing binary packages of watcher

Browse Source 
Change-Id: I05b80a6c9455bc1faf986e1aa6b92cb6fd80d0fd
This commit is contained in:
ZhongShengping 2017-01-04 11:54:56 +08:00
parent 0c96526de8
commit f1479c6e22
5 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docker/watcher/watcher-api/Dockerfile.j2
View File

@ -3,11 +3,15 @@ MAINTAINER {{ maintainer }}
{% block watcher_api_header %}{% endblock %} {% block watcher_api_header %}{% endblock %}
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% set watcher_api_packages = ['openstack-watcher-api'] %}
&& /bin/false {% elif base_distro in ['ubuntu'] %}
{% set watcher_api_packages = ['watcher-api'] %}
{% endif %}
{{ macros.install_packages(watcher_api_packages | customizable("packages")) }}
{% endif %} {% endif %}
COPY extend_start.sh /usr/local/bin/kolla_watcher_extend_start COPY extend_start.sh /usr/local/bin/kolla_watcher_extend_start

12
docker/watcher/watcher-applier/Dockerfile.j2
View File

@ -3,11 +3,15 @@ MAINTAINER {{ maintainer }}
{% block watcher_applier_header %}{% endblock %} {% block watcher_applier_header %}{% endblock %}
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% set watcher_applier_packages = ['openstack-watcher-applier'] %}
&& /bin/false {% elif base_distro in ['ubuntu'] %}
{% set watcher_applier_packages = ['watcher-applier'] %}
{% endif %}
{{ macros.install_packages(watcher_applier_packages | customizable("packages")) }}
{% endif %} {% endif %}
{% block watcher_applier_footer %}{% endblock %} {% block watcher_applier_footer %}{% endblock %}

11
docker/watcher/watcher-base/Dockerfile.j2
View File

@ -3,10 +3,15 @@ MAINTAINER {{ maintainer }}
{% block watcher_base_header %}{% endblock %} {% block watcher_base_header %}{% endblock %}
{% if install_type == 'binary' %} {% import "macros.j2" as macros with context %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% if install_type == 'binary' %}
&& /bin/false {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set watcher_base_packages = ['openstack-watcher-common'] %}
{% elif base_distro in ['ubuntu'] %}
{% set watcher_base_packages = ['watcher-common'] %}
{% endif %}
{{ macros.install_packages(watcher_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}

12
docker/watcher/watcher-engine/Dockerfile.j2
View File

@ -3,11 +3,15 @@ MAINTAINER {{ maintainer }}
{% block watcher_engine_header %}{% endblock %} {% block watcher_engine_header %}{% endblock %}
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% set watcher_engine_packages = ['openstack-watcher-decision-engine'] %}
&& /bin/false {% elif base_distro in ['ubuntu'] %}
{% set watcher_engine_packages = ['watcher-decision-engine'] %}
{% endif %}
{{ macros.install_packages(watcher_engine_packages | customizable("packages")) }}
{% endif %} {% endif %}
{% block watcher_engine_footer %}{% endblock %} {% block watcher_engine_footer %}{% endblock %}

3
tests/test_build.py
View File

@ -81,7 +81,6 @@ class BuildTestCentosBinary(BuildTest, base.BaseTestCase):
"solum-base", "solum-base",
"tacker", "tacker",
"vmtp", "vmtp",
"watcher-base",
"zun-base", "zun-base",
] ]
@ -120,7 +119,6 @@ class BuildTestUbuntuBinary(BuildTest, base.BaseTestCase):
"solum-base", "solum-base",
"tacker", "tacker",
"vmtp", "vmtp",
"watcher-base",
"zaqar", "zaqar",
"zun-base", "zun-base",
] ]
@ -157,7 +155,6 @@ class BuildTestOracleLinuxBinary(BuildTest, base.BaseTestCase):
"solum-base", "solum-base",
"tacker", "tacker",
"vmtp", "vmtp",
"watcher-base",
"zun-base", "zun-base",
] ]