diff options
| author | Zuul <zuul@review.opendev.org> | 2019-05-07 05:18:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-05-07 05:18:55 +0000 |
| commit | 98a946f9d595ec6ea230f391f75e65168ec24c56 (patch) | |
| tree | 916c01e25329151ec210a260ca19b0c27e0e8206 /docker | |
| parent | e5bc650836d7f4a746d7d6c8c64089ed511ce556 (diff) | |
| parent | c4b62490714ea849cedfe07d4b9a6aebf1f815c0 (diff) | |
| download | kolla-98a946f9d595ec6ea230f391f75e65168ec24c56.tar.gz kolla-98a946f9d595ec6ea230f391f75e65168ec24c56.zip | |
Merge "Drop systemd support from PAM"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index a26ba63fc..135f4ea4a 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -402,6 +402,10 @@ RUN sed -i \ {# endif base_package_type deb #} {% endif %} +{% if base_distro == 'centos' or base_distro == 'rhel' %} +RUN sed -ri '/-session(\s+)optional(\s+)pam_systemd.so/d' /etc/pam.d/system-auth +{% endif %} + COPY set_configs.py /usr/local/bin/kolla_set_configs COPY start.sh /usr/local/bin/kolla_start COPY sudoers /etc/sudoers |