Merge "watcher: drop binary parts"

4 files changed, 0 insertions, 39 deletions

diff --git a/docker/watcher/watcher-api/Dockerfile.j2 b/docker/watcher/watcher-api/Dockerfile.j2
index 70e5cccbc..d080811df 100644
--- a/docker/watcher/watcher-api/Dockerfile.j2
+++ b/docker/watcher/watcher-api/Dockerfile.j2
@@ -7,15 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% import "macros.j2" as macros with context %}
 
-{% if install_type == 'binary' %}
-    {% if base_package_type == 'rpm' %}
-        {% set watcher_api_packages = ['openstack-watcher-api'] %}
-    {% elif base_package_type == 'deb' %}
-        {% 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
 RUN chmod 755 /usr/local/bin/kolla_watcher_extend_start
 
diff --git a/docker/watcher/watcher-applier/Dockerfile.j2 b/docker/watcher/watcher-applier/Dockerfile.j2
index 060e6733c..c5d0e70d8 100644
--- a/docker/watcher/watcher-applier/Dockerfile.j2
+++ b/docker/watcher/watcher-applier/Dockerfile.j2
@@ -7,15 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% import "macros.j2" as macros with context %}
 
-{% if install_type == 'binary' %}
-    {% if base_package_type == 'rpm' %}
-        {% set watcher_applier_packages = ['openstack-watcher-applier'] %}
-    {% elif base_package_type == 'deb' %}
-        {% set watcher_applier_packages = ['watcher-applier'] %}
-    {% endif %}
-{{ macros.install_packages(watcher_applier_packages | customizable("packages")) }}
-{% endif %}
-
 {% block watcher_applier_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
diff --git a/docker/watcher/watcher-base/Dockerfile.j2 b/docker/watcher/watcher-base/Dockerfile.j2
index 9e1f645ca..67c180715 100644
--- a/docker/watcher/watcher-base/Dockerfile.j2
+++ b/docker/watcher/watcher-base/Dockerfile.j2
@@ -10,16 +10,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ macros.enable_extra_repos(['powertools']) }}
 {{ macros.configure_user(name='watcher') }}
 
-{% if install_type == 'binary' %}
-    {% if base_package_type == 'rpm' %}
-        {% set watcher_base_packages = ['openstack-watcher-common'] %}
-    {% elif base_package_type == 'deb' %}
-        {% set watcher_base_packages = ['watcher-common'] %}
-    {% endif %}
-{{ macros.install_packages(watcher_base_packages | customizable("packages")) }}
-
-{% elif install_type == 'source' %}
-
 ADD watcher-base-archive /watcher-base-source
 
 {% set watcher_base_pip_packages = [
@@ -32,8 +22,6 @@ RUN ln -s watcher-base-source/* watcher \
     && cp -r /watcher/etc/watcher/* /etc/watcher/ \
     && chown -R watcher: /etc/watcher
 
-{% endif %}
-
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 
 RUN touch /usr/local/bin/kolla_watcher_extend_start \
diff --git a/docker/watcher/watcher-engine/Dockerfile.j2 b/docker/watcher/watcher-engine/Dockerfile.j2
index 563890762..f939cbea1 100644
--- a/docker/watcher/watcher-engine/Dockerfile.j2
+++ b/docker/watcher/watcher-engine/Dockerfile.j2
@@ -7,15 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% import "macros.j2" as macros with context %}
 
-{% if install_type == 'binary' %}
-    {% if base_package_type == 'rpm' %}
-        {% set watcher_engine_packages = ['openstack-watcher-decision-engine'] %}
-    {% elif base_package_type == 'deb' %}
-        {% set watcher_engine_packages = ['watcher-decision-engine'] %}
-    {% endif %}
-{{ macros.install_packages(watcher_engine_packages | customizable("packages")) }}
-{% endif %}
-
 {% block watcher_engine_footer %}{% endblock %}
 {% block footer %}{% endblock %}