Merge "drop leftovers of RHEL support"

8 files changed, 9 insertions, 37 deletions

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 13372519f..9430f2d13 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -138,23 +138,12 @@ RUN rm -f /etc/rpm/macros.image-language-conf \
 {%- if not loop.last %} \{% endif %}
 {% endfor -%}
 
-    {% if install_metatype in ['rdo', 'mixed'] %}
-
 {% for cmd in rpm_setup %}
 {{ cmd }}
 {% endfor %}
 
 {% block base_centos_repo_overrides_post_rpm %}{% endblock %}
 
-    {% endif %}
-    {# endif for repo setup for all RHEL except RHEL OSP #}
-
-    {% if install_metatype == 'rhos' %}
-
-{% block base_rhos_repo_enablement %}{% endblock %}
-
-    {% endif %}
-
     {% if base_distro == 'centos' %}
 
 {% block base_centos_gpg_key_import %}
@@ -213,13 +202,6 @@ RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("cen
     {%- endif %}
     {# Endif for base_distro centos #}
 
-    {% if base_distro == 'rhel' %}
-
-{% block base_rhel_package_installation %}{% endblock %}
-
-    {% endif %}
-    {# Endif for base_distro RHEL #}
-
 #### END REPO ENABLEMENT
 
 {# We are back to the basic if conditional here which is:
@@ -391,7 +373,7 @@ RUN apt-get update \
 {# endif base_package_type deb #}
 {% endif %}
 
-{% if base_distro == 'centos' or base_distro == 'rhel' %}
+{% if base_distro == 'centos' %}
 RUN sed -ri '/-session(\s+)optional(\s+)pam_systemd.so/d' /etc/pam.d/system-auth \
     && sed -ri '/^[^#]/ s/systemd//g' /etc/nsswitch.conf
 {% endif %}
diff --git a/docker/base/copy_cacerts.sh b/docker/base/copy_cacerts.sh
index aa0dd679a..5e8955fed 100644
--- a/docker/base/copy_cacerts.sh
+++ b/docker/base/copy_cacerts.sh
@@ -17,7 +17,7 @@ if [[ -d /var/lib/kolla/config_files/ca-certificates ]] && \
         done
         update-ca-certificates
     elif [[ -e /etc/redhat-release ]]; then
-        # CentOS, RHEL
+        # CentOS
         for cert in /var/lib/kolla/config_files/ca-certificates/*; do
             file=$(basename "$cert")
             cp $cert "/etc/pki/ca-trust/source/anchors/kolla-customca-$file"
diff --git a/docker/ironic/ironic-pxe/extend_start.sh b/docker/ironic/ironic-pxe/extend_start.sh
index 44f101bb0..af20d01d6 100644
--- a/docker/ironic/ironic-pxe/extend_start.sh
+++ b/docker/ironic/ironic-pxe/extend_start.sh
@@ -15,7 +15,7 @@ function prepare_pxe {
 function prepare_ipxe {
     if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then
         cp /usr/lib/ipxe/{undionly.kpxe,ipxe.efi} /tftpboot
-    elif [[ "${KOLLA_BASE_DISTRO}" =~ centos|rhel ]]; then
+    elif [[ "${KOLLA_BASE_DISTRO}" =~ centos ]]; then
         cp /usr/share/ipxe/{undionly.kpxe,ipxe*.efi} /tftpboot
     fi
 }
@@ -35,7 +35,7 @@ if [[ -d /usr/lib/grub/arm64-efi ]]; then
 
     if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then
         grub-mkimage -v -o /tftpboot/grubaa64.efi -O arm64-efi -p "grub" $modules
-    elif [[ "${KOLLA_BASE_DISTRO}" =~ centos|rhel ]]; then
+    elif [[ "${KOLLA_BASE_DISTRO}" =~ centos ]]; then
         grub2-mkimage -v -o /tftpboot/grubaa64.efi -O arm64-efi -p "EFI/centos" $modules
     fi
 fi
diff --git a/docker/macros.j2 b/docker/macros.j2
index 7076e422c..0af1b6f14 100644
--- a/docker/macros.j2
+++ b/docker/macros.j2
@@ -82,6 +82,5 @@ RUN usermod --append --home {{ homedir }} --groups kolla {{ name }} \
 {% endmacro %}
 
 {% macro add_binary_source_envs() %}
-ENV KOLLA_INSTALL_TYPE={{ install_type }} \
-    KOLLA_INSTALL_METATYPE={{ install_metatype }}
+ENV KOLLA_INSTALL_TYPE={{ install_type }}
 {% endmacro %}
diff --git a/docker/magnum/magnum-api/Dockerfile.j2 b/docker/magnum/magnum-api/Dockerfile.j2
index 1bc75758e..773d7bbbc 100644
--- a/docker/magnum/magnum-api/Dockerfile.j2
+++ b/docker/magnum/magnum-api/Dockerfile.j2
@@ -8,11 +8,8 @@ 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' and base_distro != 'rhel' %}
+    {% if base_package_type == 'rpm' %}
        {% set magnum_api_packages = ['openstack-magnum-api'] %}
-    {% elif base_package_type == 'rpm' and base_distro == 'rhel' %}
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
     {% elif base_package_type == 'deb' %}
        {% set magnum_api_packages = ['magnum-api'] %}
     {% endif %}
diff --git a/docker/magnum/magnum-base/Dockerfile.j2 b/docker/magnum/magnum-base/Dockerfile.j2
index 14024b6ac..83f5a5759 100644
--- a/docker/magnum/magnum-base/Dockerfile.j2
+++ b/docker/magnum/magnum-base/Dockerfile.j2
@@ -10,11 +10,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ macros.configure_user(name='magnum') }}
 
 {% if install_type == 'binary' %}
-    {% if base_package_type == 'rpm' and base_distro != 'rhel' %}
+    {% if base_package_type == 'rpm' %}
        {% set magnum_base_packages = ['openstack-magnum-common'] %}
-    {% elif base_package_type == 'rpm' and base_distro == 'rhel' %}
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/bash
     {% elif base_package_type == 'deb' %}
        {% set magnum_base_packages = ['magnum-common'] %}
     {% endif %}
diff --git a/docker/magnum/magnum-conductor/Dockerfile.j2 b/docker/magnum/magnum-conductor/Dockerfile.j2
index 39178fccf..d6393a1cb 100644
--- a/docker/magnum/magnum-conductor/Dockerfile.j2
+++ b/docker/magnum/magnum-conductor/Dockerfile.j2
@@ -8,13 +8,10 @@ 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' and base_distro != 'rhel' %}
+    {% if base_package_type == 'rpm' %}
         {% set magnum_conductor_packages = [
              'openstack-magnum-conductor'
          ] %}
-    {% elif base_package_type == 'rpm' and base_distro == 'rhel' %}
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
     {% elif base_package_type == 'deb' %}
         {% set magnum_conductor_packages = [
              'magnum-conductor'
diff --git a/docker/ovsdpdk/ovsdpdk/Dockerfile.j2 b/docker/ovsdpdk/ovsdpdk/Dockerfile.j2
index d56088720..0f01621b9 100644
--- a/docker/ovsdpdk/ovsdpdk/Dockerfile.j2
+++ b/docker/ovsdpdk/ovsdpdk/Dockerfile.j2
@@ -11,7 +11,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% if base_package_type == 'rpm' %}
 
 #TODO(sean-k-mooney) create repo via open suse build system to package
-# for centos/rhel distros.
+# for centos distro.
 
 RUN echo 'image not yet available for {{ base_distro }}' \
     && /bin/false