Add support for installing binary packages of watcher

Change-Id: I05b80a6c9455bc1faf986e1aa6b92cb6fd80d0fd

5 files changed, 32 insertions, 18 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
diff --git a/docker/watcher/watcher-applier/Dockerfile.j2 b/docker/watcher/watcher-applier/Dockerfile.j2
index 9a5ffa573..364ab2abc 100644
--- a/docker/watcher/watcher-applier/Dockerfile.j2
+++ b/docker/watcher/watcher-applier/Dockerfile.j2
@@ -3,11 +3,15 @@ MAINTAINER {{ maintainer }}
 
 {% block watcher_applier_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_applier_packages = ['openstack-watcher-applier'] %}
+    {% elif base_distro in ['ubuntu'] %}
+        {% set watcher_applier_packages = ['watcher-applier'] %}
+    {% endif %}
+{{ macros.install_packages(watcher_applier_packages | customizable("packages")) }}
 {% endif %}
 
 {% block watcher_applier_footer %}{% endblock %}
diff --git a/docker/watcher/watcher-base/Dockerfile.j2 b/docker/watcher/watcher-base/Dockerfile.j2
index 1e695dc0b..a2fa51032 100644
--- a/docker/watcher/watcher-base/Dockerfile.j2
+++ b/docker/watcher/watcher-base/Dockerfile.j2
@@ -3,10 +3,15 @@ MAINTAINER {{ maintainer }}
 
 {% 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 }}' \
-    && /bin/false
+{% if install_type == 'binary' %}
+    {% 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' %}
 
diff --git a/docker/watcher/watcher-engine/Dockerfile.j2 b/docker/watcher/watcher-engine/Dockerfile.j2
index 3b924d0c7..3aad9ea59 100644
--- a/docker/watcher/watcher-engine/Dockerfile.j2
+++ b/docker/watcher/watcher-engine/Dockerfile.j2
@@ -3,11 +3,15 @@ MAINTAINER {{ maintainer }}
 
 {% block watcher_engine_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_engine_packages = ['openstack-watcher-decision-engine'] %}
+    {% elif base_distro in ['ubuntu'] %}
+        {% set watcher_engine_packages = ['watcher-decision-engine'] %}
+    {% endif %}
+{{ macros.install_packages(watcher_engine_packages | customizable("packages")) }}
 {% endif %}
 
 {% block watcher_engine_footer %}{% endblock %}
diff --git a/tests/test_build.py b/tests/test_build.py
index fcd78d532..786a5e248 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -81,7 +81,6 @@ class BuildTestCentosBinary(BuildTest, base.BaseTestCase):
         "solum-base",
         "tacker",
         "vmtp",
-        "watcher-base",
         "zun-base",
     ]
 
@@ -120,7 +119,6 @@ class BuildTestUbuntuBinary(BuildTest, base.BaseTestCase):
         "solum-base",
         "tacker",
         "vmtp",
-        "watcher-base",
         "zaqar",
         "zun-base",
     ]
@@ -157,7 +155,6 @@ class BuildTestOracleLinuxBinary(BuildTest, base.BaseTestCase):
         "solum-base",
         "tacker",
         "vmtp",
-        "watcher-base",
         "zun-base",
     ]