diff options
| author | Zuul <zuul@review.opendev.org> | 2021-08-04 13:53:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-08-04 13:53:41 +0000 |
| commit | ea6ceef686c018d810a2ff20ca4ba81aa77164e5 (patch) | |
| tree | defd00df6e8a409b28e77249e345d3056cd9d043 /docker/base | |
| parent | c1e7df7c89af3b5066279deafba212a001f1df84 (diff) | |
| parent | bd90b02708d8c6b88692ec7308a41229fdcdaf22 (diff) | |
| download | kolla-ea6ceef686c018d810a2ff20ca4ba81aa77164e5.tar.gz kolla-ea6ceef686c018d810a2ff20ca4ba81aa77164e5.zip | |
Merge "drop leftovers of RHEL support"
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 20 | ||||
| -rw-r--r-- | docker/base/copy_cacerts.sh | 2 |
2 files changed, 2 insertions, 20 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" |