2 files changed, 9 insertions, 53 deletions
diff --git a/docker/placement/placement-api/Dockerfile.j2 b/docker/placement/placement-api/Dockerfile.j2
index c91179c59..76e1459be 100644
--- a/docker/placement/placement-api/Dockerfile.j2
+++ b/docker/placement/placement-api/Dockerfile.j2
@@ -7,31 +7,9 @@ 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 placement_api_packages = [
-            'openstack-placement-api'
-        ] %}
-
-{{ macros.install_packages(placement_api_packages | customizable("packages")) }}
-
-    {% elif base_package_type == 'deb' %}
-
-        {% set placement_api_packages = [
-            'placement-api'
-        ] %}
-
-{{ macros.install_packages(placement_api_packages | customizable("packages")) }}
-RUN rm -f /etc/apache2/sites-enabled/placement-api.conf
-
-    {% endif %}
-{% elif install_type == 'source' %}
-
-    {% set placement_api_packages = [
-    ] %}
+{% set placement_api_packages = [
+] %}
 {{ macros.install_packages(placement_api_packages | customizable("packages")) }}
-{% endif %}
 
 COPY extend_start.sh /usr/local/bin/kolla_placement_extend_start
 
diff --git a/docker/placement/placement-base/Dockerfile.j2 b/docker/placement/placement-base/Dockerfile.j2
index 55ca9d141..b2230f0f4 100644
--- a/docker/placement/placement-base/Dockerfile.j2
+++ b/docker/placement/placement-base/Dockerfile.j2
@@ -9,37 +9,17 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.configure_user(name='placement') }}
 
-{% if install_type == 'binary' %}
+{% if base_package_type == 'rpm' %}
 
-    {% if base_package_type == 'rpm' %}
+    {% set placement_base_packages = [
+    ] %}
 
-        {% set placement_base_packages = [
-            'openstack-placement-common',
-        ] %}
+{% elif base_package_type == 'deb' %}
 
-    {% elif base_package_type == 'deb' %}
+    {% set placement_base_packages = [
+    ] %}
 
-        {% set placement_base_packages = [
-            'placement-common',
-        ] %}
-
-    {% endif %}
-
-{{ macros.install_packages(placement_base_packages | customizable("packages")) }}
-
-{% elif install_type == 'source' %}
-
-    {% if base_package_type == 'rpm' %}
-
-        {% set placement_base_packages = [
-        ] %}
-
-    {% elif base_package_type == 'deb' %}
-
-        {% set placement_base_packages = [
-        ] %}
-
-    {% endif %}
+{% endif %}
 
 {{ macros.install_packages(placement_base_packages | customizable("packages")) }}
 
@@ -56,8 +36,6 @@ RUN ln -s placement-base-source/* placement \
     && cp -r /placement/etc/placement/* /etc/placement/ \
     && chown -R placement: /etc/placement/
 
-{% endif %}
-
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 
 RUN touch /usr/local/bin/kolla_placement_extend_start \