docker: drop binary parts

Big patch drops all mentions of binary images support. Suggestions are
welcome how to split it into parts or handle better.

Change-Id: I5d5a46c6ce7734ceb8b844e17b43e359d7cac6e3

2 files changed, 13 insertions, 127 deletions

diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2
index 6801b7aa0..5d97d6f94 100644
--- a/docker/horizon/Dockerfile.j2
+++ b/docker/horizon/Dockerfile.j2
@@ -10,112 +10,20 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ macros.enable_extra_repos(['powertools']) }}
 {{ macros.configure_user(name='horizon') }}
 
-{% if install_type == 'binary' %}
-    {% if base_package_type == 'rpm' %}
-        {% set horizon_packages = [
-                'gettext',
-                'openstack-cloudkitty-ui',
-                'openstack-dashboard',
-                'openstack-designate-ui',
-                'openstack-heat-ui',
-                'openstack-ironic-ui',
-                'openstack-magnum-ui',
-                'openstack-manila-ui',
-                'openstack-mistral-ui',
-                'openstack-murano-ui',
-                'openstack-octavia-ui',
-                'openstack-sahara-ui',
-                'openstack-trove-ui',
-                'openstack-vitrage-ui',
-        ] %}
+{% if base_package_type == 'rpm' %}
 
-{{ macros.install_packages(horizon_packages | customizable("packages")) }}
-
-{% block horizon_redhat_binary_setup %}
-RUN ln -s /usr/share/openstack-dashboard/openstack_dashboard /usr/lib/python{{ distro_python_version }}/site-packages/openstack_dashboard \
-    && ln -s /usr/share/openstack-dashboard/static /usr/lib/python{{ distro_python_version }}/site-packages/static \
-    && chown -R horizon: /etc/openstack-dashboard /usr/share/openstack-dashboard \
-    && chown -R apache: /usr/share/openstack-dashboard/static \
-    && sed -i "s|WEBROOT = '/dashboard/'|WEBROOT = '/'|" /etc/openstack-dashboard/local_settings \
-    && cp /usr/share/openstack-dashboard/manage.py /usr/bin/manage.py \
-    && rm -f /usr/share/openstack-dashboard/openstack_dashboard/local/enabled/?[^_]*.py* \
-    && rm -f /usr/lib/python{{ distro_python_version }}/site-packages/openstack_dashboard/local/enabled/?[^_]*.py* \
-    && for locale in /usr/lib/python{{ distro_python_version }}/site-packages/*/locale; do \
-           (cd ${locale%/*} && /usr/bin/django-admin compilemessages) \
-       done
-{% endblock %}
-
-    {% elif base_package_type == 'deb' %}
-        {% set horizon_packages = [
-                'gettext',
-                'locales',
-                'openstack-dashboard',
-                'python3-cloudkitty-dashboard',
-                'python3-designate-dashboard',
-                'python3-freezer-web-ui',
-                'python3-heat-dashboard',
-                'python3-ironic-ui',
-                'python3-magnum-ui',
-                'python3-manila-ui',
-                'python3-mistral-dashboard',
-                'python3-murano-dashboard',
-                'python3-neutron-vpnaas-dashboard',
-                'python3-octavia-dashboard',
-                'python3-sahara-dashboard',
-                'python3-senlin-dashboard',
-                'python3-trove-dashboard',
-                'python3-vitrage-dashboard',
-                'python3-watcher-dashboard',
-                'tzdata',
-        ] %}
-
-        {% if base_distro == 'debian' %}
-            {% set horizon_packages = horizon_packages + [
-                'python3-masakari-dashboard',
-            ] %}
-        {% endif %}
+    {% set horizon_packages = [
+        'gettext'
+    ] %}
 
 {{ macros.install_packages(horizon_packages | customizable("packages")) }}
+{% elif base_package_type == 'deb' %}
 
-{% block horizon_ubuntu_binary_setup %}
-RUN sed -i 's|\(ServerTokens \)OS|\1Prod|' /etc/apache2/conf-available/security.conf \
-    && ln -s ../mods-available/headers.load  /etc/apache2/mods-enabled/headers.load \
-    && ln -s ../mods-available/expires.load  /etc/apache2/mods-enabled/expires.load \
-    {% if base_distro == 'ubuntu' %}
-    && cp -r /usr/share/openstack-dashboard/openstack_dashboard/conf/* /etc/openstack-dashboard \
-    && rm /etc/apache2/conf-enabled/openstack-dashboard.conf \
-    {% else %}
-    && cp -r /etc/openstack-dashboard/policy/* /etc/openstack-dashboard \
-    {% endif %}
-    && cp /usr/share/openstack-dashboard/manage.py /usr/bin/manage.py \
-    && rm /etc/openstack-dashboard/local_settings.py \
-    && ln -s /etc/openstack-dashboard/local_settings /etc/openstack-dashboard/local_settings.py \
-    && for locale in /usr/lib/python3/dist-packages/*/locale; do \
-           (cd ${locale%/*} && /usr/bin/django-admin compilemessages) \
-       done {% if install_type == 'binary' and base_distro == 'debian' %} \
-    && rm -rf /etc/openstack-dashboard/enabled/* \
-              /etc/openstack-dashboard/local_settings.d/* \
-              /usr/lib/python3/dist-packages/openstack_dashboard/conf \
-    && mv /etc/openstack-dashboard/policy /usr/lib/python3/dist-packages/openstack_dashboard/conf
-    {% endif %}
-{% endblock %}
-
-    {% endif %}
-{% elif install_type == 'source' %}
-    {% if base_package_type == 'rpm' %}
-
-        {% set horizon_packages = [
-                'gettext'
-        ] %}
-
-{{ macros.install_packages(horizon_packages | customizable("packages")) }}
-    {% elif base_package_type == 'deb' %}
-
-        {% set horizon_packages = [
-                'gettext',
-                'locales',
-                'tzdata'
-        ] %}
+    {% set horizon_packages = [
+        'gettext',
+        'locales',
+        'tzdata'
+    ] %}
 
 {{ macros.install_packages(horizon_packages | customizable("packages")) }}
 
@@ -123,7 +31,7 @@ RUN sed -i 's|\(ServerTokens \)OS|\1Prod|' /etc/apache2/conf-available/security.
 RUN ln -s ../mods-available/headers.load  /etc/apache2/mods-enabled/headers.load
 {% endblock %}
 
-    {% endif %}
+{% endif %}
 
 ADD horizon-archive /horizon-source
 ADD plugins-archive /
@@ -152,8 +60,6 @@ RUN ln -s horizon-source/* horizon \
        done \
     && chown -R horizon: /etc/openstack-dashboard
 
-{% endif %}
-
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 RUN chmod 755 /usr/local/bin/kolla_extend_start
 
diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh
index e95f50caf..b36d06a0a 100644
--- a/docker/horizon/extend_start.sh
+++ b/docker/horizon/extend_start.sh
@@ -5,15 +5,7 @@ set -o errexit
 FORCE_GENERATE="${FORCE_GENERATE:-no}"
 HASH_PATH=/var/lib/kolla/.settings.md5sum.txt
 
-if [[ ${KOLLA_INSTALL_TYPE} == "binary" ]]; then
-    if [[ ${KOLLA_BASE_DISTRO} == "debian" ]] || [[ ${KOLLA_BASE_DISTRO} == "ubuntu" ]]; then
-        SITE_PACKAGES="/usr/lib/python3/dist-packages"
-    else
-        SITE_PACKAGES="/usr/lib/python${KOLLA_DISTRO_PYTHON_VERSION}/site-packages"
-    fi
-elif [[ ${KOLLA_INSTALL_TYPE} == "source" ]]; then
-    SITE_PACKAGES="/var/lib/kolla/venv/lib/python${KOLLA_DISTRO_PYTHON_VERSION}/site-packages"
-fi
+SITE_PACKAGES="/var/lib/kolla/venv/lib/python${KOLLA_DISTRO_PYTHON_VERSION}/site-packages"
 
 if [[ -f "/var/lib/kolla/venv/bin/python" ]]; then
     MANAGE_PY="/var/lib/kolla/venv/bin/python /var/lib/kolla/venv/bin/manage.py"
@@ -21,20 +13,13 @@ else
     MANAGE_PY="/usr/bin/python${KOLLA_DISTRO_PYTHON_VERSION} /usr/bin/manage.py"
 fi
 
-if [[ ${KOLLA_INSTALL_TYPE} == "source" ]] && [[ ! -f ${SITE_PACKAGES}/openstack_dashboard/local/local_settings.py ]]; then
-    ln -s /etc/openstack-dashboard/local_settings \
-        ${SITE_PACKAGES}/openstack_dashboard/local/local_settings.py
-elif [[ ${KOLLA_BASE_DISTRO} == "debian" ]] && [[ ${KOLLA_INSTALL_TYPE} == "binary" ]]; then
-    rm -f ${SITE_PACKAGES}/openstack_dashboard/local/local_settings.py
+if [[ ! -f ${SITE_PACKAGES}/openstack_dashboard/local/local_settings.py ]]; then
     ln -s /etc/openstack-dashboard/local_settings \
         ${SITE_PACKAGES}/openstack_dashboard/local/local_settings.py
 fi
 
 if [[ -f /etc/openstack-dashboard/custom_local_settings ]]; then
     CUSTOM_SETTINGS_FILE="${SITE_PACKAGES}/openstack_dashboard/local/custom_local_settings.py"
-    if  [[ ${KOLLA_INSTALL_TYPE} == "binary" ]] && [[ "${KOLLA_BASE_DISTRO}" =~ ubuntu ]]; then
-        CUSTOM_SETTINGS_FILE="/usr/share/openstack-dashboard/openstack_dashboard/local/custom_local_settings.py"
-    fi
 
     if [[ ! -L ${CUSTOM_SETTINGS_FILE} ]]; then
         ln -s /etc/openstack-dashboard/custom_local_settings ${CUSTOM_SETTINGS_FILE}
@@ -336,8 +321,3 @@ if [[ -f ${SITE_PACKAGES}/openstack_dashboard/local/.secret_key_store ]] && [[ $
 fi
 
 . /usr/local/bin/kolla_httpd_setup
-
-if [[ "${KOLLA_BASE_DISTRO}" == "debian" ]] && [[ ${KOLLA_INSTALL_TYPE} == "binary" ]]; then
-    APACHE_RUN_GROUP=horizon
-    APACHE_RUN_USER=horizon
-fi