diff options
| author | Zuul <zuul@review.opendev.org> | 2020-08-12 12:06:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-08-12 12:06:07 +0000 |
| commit | 408db71cd42415609984c2e016607d05ba809ef1 (patch) | |
| tree | 8c63828a01f94d5af5881d93f64760aaff4ddeee /docker/keystone | |
| parent | a3ef68d91c60c9d451450ae0e371e25402bb4c6f (diff) | |
| parent | 6319bc6f559ab5c49a7ad701b606b58af62337b0 (diff) | |
| download | kolla-408db71cd42415609984c2e016607d05ba809ef1.tar.gz kolla-408db71cd42415609984c2e016607d05ba809ef1.zip | |
Merge "Remove weird deps"
Diffstat (limited to 'docker/keystone')
| -rw-r--r-- | docker/keystone/keystone-base/Dockerfile.j2 | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/docker/keystone/keystone-base/Dockerfile.j2 b/docker/keystone/keystone-base/Dockerfile.j2 index f3b4c2d0b..2176db3e1 100644 --- a/docker/keystone/keystone-base/Dockerfile.j2 +++ b/docker/keystone/keystone-base/Dockerfile.j2 @@ -15,7 +15,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'mod_auth_mellon', 'mod_auth_openidc', 'openstack-keystone', - 'python3-keystoneclient', 'python3-ldappool' ] %} @@ -44,9 +43,10 @@ RUN mkdir -p /var/www/cgi-bin/keystone \ {% elif install_type == 'source' %} {% if base_package_type == 'rpm' %} {% set keystone_base_packages = [ + 'cyrus-sasl-devel', 'mod_auth_mellon', 'mod_auth_openidc', - 'python3-ldappool' + 'openldap-devel', ] %} RUN dnf module enable mod_auth_openidc -y @@ -56,7 +56,8 @@ RUN dnf module enable mod_auth_openidc -y {% set keystone_base_packages = [ 'libapache2-mod-auth-mellon', 'libapache2-mod-auth-openidc', - 'python3-ldappool' + 'libldap2-dev', + 'libsasl2-dev', ] %} {{ macros.install_packages(keystone_base_packages | customizable("packages")) }} {% endif %} @@ -65,7 +66,7 @@ RUN dnf module enable mod_auth_openidc -y ADD keystone-base-archive /keystone-base-source {% set keystone_base_pip_packages = [ - '/keystone' + '/keystone[ldap]', ] %} RUN ln -s keystone-base-source/* keystone \ |
