Merge "Remove weird deps"
This commit is contained in:
commit
408db71cd4
|
@ -16,7 +16,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
{% set aodh_base_packages = [
|
{% set aodh_base_packages = [
|
||||||
'openstack-aodh-api',
|
'openstack-aodh-api',
|
||||||
'openstack-aodh-common',
|
'openstack-aodh-common',
|
||||||
'python3-ldappool'
|
|
||||||
] %}
|
] %}
|
||||||
|
|
||||||
{{ macros.install_packages(aodh_base_packages | customizable("packages")) }}
|
{{ macros.install_packages(aodh_base_packages | customizable("packages")) }}
|
||||||
|
@ -27,7 +26,6 @@ RUN mkdir -p /var/www/cgi-bin/aodh \
|
||||||
{% set aodh_base_packages = [
|
{% set aodh_base_packages = [
|
||||||
'aodh-common',
|
'aodh-common',
|
||||||
'python3-aodh',
|
'python3-aodh',
|
||||||
'python3-ldappool'
|
|
||||||
] %}
|
] %}
|
||||||
|
|
||||||
{{ macros.install_packages(aodh_base_packages | customizable("packages")) }}
|
{{ macros.install_packages(aodh_base_packages | customizable("packages")) }}
|
||||||
|
@ -38,7 +36,6 @@ RUN mkdir -p /var/www/cgi-bin/aodh \
|
||||||
{% elif install_type == 'source' %}
|
{% elif install_type == 'source' %}
|
||||||
|
|
||||||
{% set aodh_base_packages = [
|
{% set aodh_base_packages = [
|
||||||
'python3-ldappool'
|
|
||||||
] %}
|
] %}
|
||||||
|
|
||||||
{{ macros.install_packages(aodh_base_packages | customizable("packages")) }}
|
{{ macros.install_packages(aodh_base_packages | customizable("packages")) }}
|
||||||
|
|
|
@ -10,7 +10,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
{% if install_type == 'binary' %}
|
{% if install_type == 'binary' %}
|
||||||
{% if base_package_type == 'rpm' %}
|
{% if base_package_type == 'rpm' %}
|
||||||
{% set cinder_api_packages = [
|
{% set cinder_api_packages = [
|
||||||
'python3-keystone'
|
|
||||||
] %}
|
] %}
|
||||||
{% elif base_package_type == 'deb' %}
|
{% elif base_package_type == 'deb' %}
|
||||||
{% set cinder_api_packages = [
|
{% set cinder_api_packages = [
|
||||||
|
|
|
@ -22,7 +22,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
'gnocchi-common',
|
'gnocchi-common',
|
||||||
'python3-boto3',
|
'python3-boto3',
|
||||||
'python3-cradox',
|
'python3-cradox',
|
||||||
'python3-ldappool',
|
|
||||||
] %}
|
] %}
|
||||||
{{ macros.install_packages(gnocchi_base_packages | customizable("packages")) }}
|
{{ macros.install_packages(gnocchi_base_packages | customizable("packages")) }}
|
||||||
{% elif base_package_type == 'deb' %}
|
{% elif base_package_type == 'deb' %}
|
||||||
|
@ -33,7 +32,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
'librados-dev',
|
'librados-dev',
|
||||||
'python3-boto3',
|
'python3-boto3',
|
||||||
'python3-dev',
|
'python3-dev',
|
||||||
'python3-ldappool',
|
|
||||||
'python3-pip',
|
'python3-pip',
|
||||||
'python3-rados',
|
'python3-rados',
|
||||||
'python3-setuptools',
|
'python3-setuptools',
|
||||||
|
@ -52,7 +50,6 @@ RUN {{ macros.install_pip(gnocchi_base_pip_packages | customizable("pip_packages
|
||||||
|
|
||||||
{% set gnocchi_base_packages = [
|
{% set gnocchi_base_packages = [
|
||||||
'librados2-devel',
|
'librados2-devel',
|
||||||
'python3-ldappool'
|
|
||||||
] %}
|
] %}
|
||||||
|
|
||||||
# on x86-64 pip grabs precompiled numpy/scipy - on aarch64/ppc64le
|
# on x86-64 pip grabs precompiled numpy/scipy - on aarch64/ppc64le
|
||||||
|
@ -71,7 +68,6 @@ RUN mkdir -p /var/www/cgi-bin/gnocchi
|
||||||
|
|
||||||
{% set gnocchi_base_packages = [
|
{% set gnocchi_base_packages = [
|
||||||
'librados-dev',
|
'librados-dev',
|
||||||
'python3-ldappool'
|
|
||||||
] %}
|
] %}
|
||||||
|
|
||||||
# on x86-64 pip grabs precompiled numpy/scipy - on aarch64/ppc64le
|
# on x86-64 pip grabs precompiled numpy/scipy - on aarch64/ppc64le
|
||||||
|
|
|
@ -15,7 +15,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
'mod_auth_mellon',
|
'mod_auth_mellon',
|
||||||
'mod_auth_openidc',
|
'mod_auth_openidc',
|
||||||
'openstack-keystone',
|
'openstack-keystone',
|
||||||
'python3-keystoneclient',
|
|
||||||
'python3-ldappool'
|
'python3-ldappool'
|
||||||
] %}
|
] %}
|
||||||
|
|
||||||
|
@ -44,9 +43,10 @@ RUN mkdir -p /var/www/cgi-bin/keystone \
|
||||||
{% elif install_type == 'source' %}
|
{% elif install_type == 'source' %}
|
||||||
{% if base_package_type == 'rpm' %}
|
{% if base_package_type == 'rpm' %}
|
||||||
{% set keystone_base_packages = [
|
{% set keystone_base_packages = [
|
||||||
|
'cyrus-sasl-devel',
|
||||||
'mod_auth_mellon',
|
'mod_auth_mellon',
|
||||||
'mod_auth_openidc',
|
'mod_auth_openidc',
|
||||||
'python3-ldappool'
|
'openldap-devel',
|
||||||
] %}
|
] %}
|
||||||
|
|
||||||
RUN dnf module enable mod_auth_openidc -y
|
RUN dnf module enable mod_auth_openidc -y
|
||||||
|
@ -56,7 +56,8 @@ RUN dnf module enable mod_auth_openidc -y
|
||||||
{% set keystone_base_packages = [
|
{% set keystone_base_packages = [
|
||||||
'libapache2-mod-auth-mellon',
|
'libapache2-mod-auth-mellon',
|
||||||
'libapache2-mod-auth-openidc',
|
'libapache2-mod-auth-openidc',
|
||||||
'python3-ldappool'
|
'libldap2-dev',
|
||||||
|
'libsasl2-dev',
|
||||||
] %}
|
] %}
|
||||||
{{ macros.install_packages(keystone_base_packages | customizable("packages")) }}
|
{{ macros.install_packages(keystone_base_packages | customizable("packages")) }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
@ -65,7 +66,7 @@ RUN dnf module enable mod_auth_openidc -y
|
||||||
ADD keystone-base-archive /keystone-base-source
|
ADD keystone-base-archive /keystone-base-source
|
||||||
|
|
||||||
{% set keystone_base_pip_packages = [
|
{% set keystone_base_pip_packages = [
|
||||||
'/keystone'
|
'/keystone[ldap]',
|
||||||
] %}
|
] %}
|
||||||
|
|
||||||
RUN ln -s keystone-base-source/* keystone \
|
RUN ln -s keystone-base-source/* keystone \
|
||||||
|
|
|
@ -19,7 +19,6 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
|
||||||
{% if base_package_type == 'rpm' %}
|
{% if base_package_type == 'rpm' %}
|
||||||
|
|
||||||
{% set masakari_base_packages = [
|
{% set masakari_base_packages = [
|
||||||
'python3-ldappool',
|
|
||||||
] %}
|
] %}
|
||||||
|
|
||||||
{{ macros.install_packages(masakari_base_packages | customizable("packages")) }}
|
{{ macros.install_packages(masakari_base_packages | customizable("packages")) }}
|
||||||
|
@ -27,7 +26,6 @@ RUN mkdir -p /var/www/cgi-bin/masakari
|
||||||
{% elif base_package_type == 'deb' %}
|
{% elif base_package_type == 'deb' %}
|
||||||
|
|
||||||
{% set masakari_base_packages = [
|
{% set masakari_base_packages = [
|
||||||
'python3-ldappool'
|
|
||||||
] %}
|
] %}
|
||||||
|
|
||||||
{{ macros.install_packages(masakari_base_packages | customizable("packages")) }}
|
{{ macros.install_packages(masakari_base_packages | customizable("packages")) }}
|
||||||
|
|
|
@ -160,7 +160,6 @@ ENV DEBIAN_FRONTEND noninteractive
|
||||||
'make',
|
'make',
|
||||||
'mariadb-devel',
|
'mariadb-devel',
|
||||||
'mod_ssl',
|
'mod_ssl',
|
||||||
'openldap-devel',
|
|
||||||
'openssl',
|
'openssl',
|
||||||
'openssl-devel',
|
'openssl-devel',
|
||||||
'pcre-devel',
|
'pcre-devel',
|
||||||
|
|
|
@ -14,7 +14,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
|
|
||||||
{% set panko_base_packages = [
|
{% set panko_base_packages = [
|
||||||
'openstack-panko-common',
|
'openstack-panko-common',
|
||||||
'python3-ldappool'
|
|
||||||
] %}
|
] %}
|
||||||
{% elif base_package_type == 'deb' %}
|
{% elif base_package_type == 'deb' %}
|
||||||
{% set panko_base_packages = [
|
{% set panko_base_packages = [
|
||||||
|
@ -26,13 +25,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
{% if base_package_type == 'rpm' %}
|
{% if base_package_type == 'rpm' %}
|
||||||
|
|
||||||
{% set panko_base_packages = [
|
{% set panko_base_packages = [
|
||||||
'python3-ldappool'
|
|
||||||
] %}
|
] %}
|
||||||
{{ macros.install_packages(panko_base_packages | customizable("packages")) }}
|
{{ macros.install_packages(panko_base_packages | customizable("packages")) }}
|
||||||
{% elif base_package_type == 'deb' %}
|
{% elif base_package_type == 'deb' %}
|
||||||
|
|
||||||
{% set panko_base_packages = [
|
{% set panko_base_packages = [
|
||||||
'python3-ldappool'
|
|
||||||
] %}
|
] %}
|
||||||
|
|
||||||
{{ macros.install_packages(panko_base_packages | customizable("packages")) }}
|
{{ macros.install_packages(panko_base_packages | customizable("packages")) }}
|
||||||
|
|
|
@ -19,13 +19,11 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
|
||||||
{% if base_package_type == 'rpm' %}
|
{% if base_package_type == 'rpm' %}
|
||||||
|
|
||||||
{% set qinling_base_packages = [
|
{% set qinling_base_packages = [
|
||||||
'python3-ldappool'
|
|
||||||
] %}
|
] %}
|
||||||
|
|
||||||
{% elif base_package_type == 'deb' %}
|
{% elif base_package_type == 'deb' %}
|
||||||
|
|
||||||
{% set qinling_base_packages = [
|
{% set qinling_base_packages = [
|
||||||
'python3-ldappool'
|
|
||||||
] %}
|
] %}
|
||||||
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
|
@ -13,7 +13,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
|
|
||||||
{% set vitrage_api_packages = [
|
{% set vitrage_api_packages = [
|
||||||
'openstack-vitrage-api',
|
'openstack-vitrage-api',
|
||||||
'python3-ldappool'
|
|
||||||
] %}
|
] %}
|
||||||
|
|
||||||
{{ macros.install_packages(vitrage_api_packages | customizable("packages")) }}
|
{{ macros.install_packages(vitrage_api_packages | customizable("packages")) }}
|
||||||
|
@ -22,7 +21,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
{% if base_distro == 'debian' %}
|
{% if base_distro == 'debian' %}
|
||||||
|
|
||||||
{% set vitrage_api_packages = [
|
{% set vitrage_api_packages = [
|
||||||
'python3-ldappool',
|
|
||||||
'vitrage-api'
|
'vitrage-api'
|
||||||
] %}
|
] %}
|
||||||
|
|
||||||
|
|
|
@ -45,7 +45,6 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
|
||||||
{% if base_package_type == 'rpm' %}
|
{% if base_package_type == 'rpm' %}
|
||||||
|
|
||||||
{% set vitrage_base_packages = [
|
{% set vitrage_base_packages = [
|
||||||
'python3-ldappool'
|
|
||||||
] %}
|
] %}
|
||||||
|
|
||||||
{{ macros.install_packages(vitrage_base_packages | customizable("packages")) }}
|
{{ macros.install_packages(vitrage_base_packages | customizable("packages")) }}
|
||||||
|
@ -53,7 +52,6 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
|
||||||
{% elif base_package_type == 'deb' %}
|
{% elif base_package_type == 'deb' %}
|
||||||
|
|
||||||
{% set vitrage_base_packages = [
|
{% set vitrage_base_packages = [
|
||||||
'python3-ldappool'
|
|
||||||
] %}
|
] %}
|
||||||
|
|
||||||
{{ macros.install_packages(vitrage_base_packages | customizable("packages")) }}
|
{{ macros.install_packages(vitrage_base_packages | customizable("packages")) }}
|
||||||
|
|
|
@ -14,7 +14,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
{% if base_package_type == 'rpm' %}
|
{% if base_package_type == 'rpm' %}
|
||||||
{% set zaqar_base_packages = [
|
{% set zaqar_base_packages = [
|
||||||
'openstack-zaqar',
|
'openstack-zaqar',
|
||||||
'python3-ldappool'
|
|
||||||
] %}
|
] %}
|
||||||
|
|
||||||
{{ macros.install_packages(zaqar_base_packages | customizable("packages")) }} \
|
{{ macros.install_packages(zaqar_base_packages | customizable("packages")) }} \
|
||||||
|
@ -25,7 +24,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
{% elif base_package_type == 'deb' %}
|
{% elif base_package_type == 'deb' %}
|
||||||
{% set zaqar_base_packages = [
|
{% set zaqar_base_packages = [
|
||||||
'zaqar-common',
|
'zaqar-common',
|
||||||
'python3-ldappool'
|
|
||||||
] %}
|
] %}
|
||||||
|
|
||||||
{{ macros.install_packages(zaqar_base_packages | customizable("packages")) }} \
|
{{ macros.install_packages(zaqar_base_packages | customizable("packages")) }} \
|
||||||
|
@ -38,14 +36,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
|
|
||||||
{% if base_package_type == 'rpm' %}
|
{% if base_package_type == 'rpm' %}
|
||||||
{% set zaqar_base_packages = [
|
{% set zaqar_base_packages = [
|
||||||
'python3-ldappool'
|
|
||||||
] %}
|
] %}
|
||||||
|
|
||||||
{{ macros.install_packages(zaqar_base_packages | customizable("packages")) }}
|
{{ macros.install_packages(zaqar_base_packages | customizable("packages")) }}
|
||||||
|
|
||||||
{% elif base_package_type == 'deb' %}
|
{% elif base_package_type == 'deb' %}
|
||||||
{% set zaqar_base_packages = [
|
{% set zaqar_base_packages = [
|
||||||
'python3-ldappool'
|
|
||||||
] %}
|
] %}
|
||||||
|
|
||||||
{{ macros.install_packages(zaqar_base_packages | customizable("packages")) }}
|
{{ macros.install_packages(zaqar_base_packages | customizable("packages")) }}
|
||||||
|
|
|
@ -20,7 +20,6 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
|
||||||
|
|
||||||
{% set zun_base_packages = [
|
{% set zun_base_packages = [
|
||||||
'numactl',
|
'numactl',
|
||||||
'python3-ldappool'
|
|
||||||
] %}
|
] %}
|
||||||
|
|
||||||
{{ macros.install_packages(zun_base_packages | customizable("packages")) }}
|
{{ macros.install_packages(zun_base_packages | customizable("packages")) }}
|
||||||
|
@ -30,7 +29,6 @@ RUN mkdir -p /var/www/cgi-bin/zun
|
||||||
|
|
||||||
{% set zun_base_packages = [
|
{% set zun_base_packages = [
|
||||||
'numactl',
|
'numactl',
|
||||||
'python3-ldappool'
|
|
||||||
] %}
|
] %}
|
||||||
|
|
||||||
{{ macros.install_packages(zun_base_packages | customizable("packages")) }}
|
{{ macros.install_packages(zun_base_packages | customizable("packages")) }}
|
||||||
|
|
Loading…
Reference in New Issue