diff options
Diffstat (limited to 'docker')
33 files changed, 99 insertions, 56 deletions
diff --git a/docker/aodh/aodh-base/Dockerfile.j2 b/docker/aodh/aodh-base/Dockerfile.j2 index 6c5d7f571..900225e7f 100644 --- a/docker/aodh/aodh-base/Dockerfile.j2 +++ b/docker/aodh/aodh-base/Dockerfile.j2 @@ -78,8 +78,8 @@ RUN mkdir -p /var/www/cgi-bin/aodh \ {% set aodh_base_packages = [ 'apache2', - 'libapache2-mod-wsgi', - 'python-ldappool' + 'libapache2-mod-wsgi-py3', + 'python3-ldappool' ] %} {{ macros.install_packages(aodh_base_packages | customizable("packages")) }} diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 38372f72d..b61a6a989 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -317,7 +317,7 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences 'netbase', 'open-iscsi', 'procps', - 'python', + 'python3', 'socat', 'sudo', 'tgt'] @@ -390,17 +390,19 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* {% endblock %} -{% if base_distro == 'ubuntu' %} -RUN sed -i \ - -e "s|\('purelib': '\$base/\)local/\(lib/python\$py_version_short/dist-packages',\)|\1\2|" \ - -e "s|\('platlib': '\$platbase/\)local/\(lib/python\$py_version_short/dist-packages',\)|\1\2|" \ - -e "s|\('headers': '\$base/\)local/\(include/python\$py_version_short/\$dist_name',\)|\1\2|" \ - -e "s|\('scripts': '\$base/\)local/\(bin',\)|\1\2|" \ - -e "s|\('data' : '\$base\)/local\(',\)|\1\2|" \ - /usr/lib/python2.7/distutils/command/install.py \ - && rm -rf /usr/lib/python2.7/site-packages \ - && ln -s dist-packages /usr/lib/python2.7/site-packages -{% endif %} +# FIXME(mgoddard): Some images, including Horizon, depend on Ubuntu having a +# site-packages directory. +#{% if base_distro == 'ubuntu' %} +#RUN sed -i \ +# -e "s|\('purelib': '\$base/\)local/\(lib/python\$py_version_short/dist-packages',\)|\1\2|" \ +# -e "s|\('platlib': '\$platbase/\)local/\(lib/python\$py_version_short/dist-packages',\)|\1\2|" \ +# -e "s|\('headers': '\$base/\)local/\(include/python\$py_version_short/\$dist_name',\)|\1\2|" \ +# -e "s|\('scripts': '\$base/\)local/\(bin',\)|\1\2|" \ +# -e "s|\('data' : '\$base\)/local\(',\)|\1\2|" \ +# /usr/lib/python{{ distro_python_version }}/distutils/command/install.py \ +# && rm -rf /usr/lib/python{{ distro_python_version }}/site-packages \ +# && ln -s dist-packages /usr/lib/{{ distro_python_version }}/site-packages +#{% endif %} {# endif base_package_type deb #} {% endif %} @@ -410,6 +412,10 @@ 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 +{% if distro_python_version.startswith('3') %} +RUN sed -i -e "s+#\!/usr/bin/env python+#\!/usr/bin/env python3+g" /usr/local/bin/kolla_set_configs +{% endif %} + COPY start.sh /usr/local/bin/kolla_start COPY sudoers /etc/sudoers COPY curlrc /root/.curlrc diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 index e8ae32dcf..d4d238b18 100644 --- a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 @@ -25,7 +25,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build ] %} {% elif base_package_type == 'deb' %} {% set ceilometer_compute_packages = [ - 'python-libvirt' + 'python3-libvirt' ] %} {% endif %} diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2 index 442e02bde..84f3a1423 100644 --- a/docker/cinder/cinder-api/Dockerfile.j2 +++ b/docker/cinder/cinder-api/Dockerfile.j2 @@ -61,7 +61,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ {% elif base_package_type == 'deb' %} {% set cinder_api_packages = [ 'apache2', - 'libapache2-mod-wsgi' + 'libapache2-mod-wsgi-py3' ] %} {{ macros.install_packages(cinder_api_packages | customizable("packages")) }} RUN echo > /etc/apache2/ports.conf diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2 index ba9d638f4..7d16272f1 100644 --- a/docker/cinder/cinder-base/Dockerfile.j2 +++ b/docker/cinder/cinder-base/Dockerfile.j2 @@ -59,6 +59,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'ceph-common', 'lvm2', 'cryptsetup', + 'python3-cephfs', + 'python3-rados', + 'python3-rbd', 'qemu-utils' ] %} {% endif %} diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2 index 88d7b9be7..fb268e990 100644 --- a/docker/cinder/cinder-volume/Dockerfile.j2 +++ b/docker/cinder/cinder-volume/Dockerfile.j2 @@ -33,7 +33,7 @@ RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/tgtd.conf {% set cinder_volume_packages = [ 'nfs-common', 'sysfsutils', - 'python-rtslib-fb', + 'python3-rtslib-fb', 'targetcli-fb', 'thin-provisioning-tools', 'tgt' diff --git a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 index 95656dbc7..cc662773d 100644 --- a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 +++ b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 @@ -48,7 +48,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ {% elif base_package_type == 'deb' %} {% set cloudkitty_api_packages = [ 'apache2', - 'libapache2-mod-wsgi' + 'libapache2-mod-wsgi-py3' ] %} {{ macros.install_packages(cloudkitty_api_packages | customizable("packages")) }} RUN echo > /etc/apache2/ports.conf diff --git a/docker/freezer/freezer-api/Dockerfile.j2 b/docker/freezer/freezer-api/Dockerfile.j2 index 9bef6e1c7..fa06784cd 100644 --- a/docker/freezer/freezer-api/Dockerfile.j2 +++ b/docker/freezer/freezer-api/Dockerfile.j2 @@ -30,7 +30,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ {% elif base_package_type == 'deb' %} {% set freezer_api_packages = [ 'apache2', - 'libapache2-mod-wsgi' + 'libapache2-mod-wsgi-py3' ] %} {{ macros.install_packages(freezer_api_packages | customizable("packages")) }} diff --git a/docker/glance/glance-base/Dockerfile.j2 b/docker/glance/glance-base/Dockerfile.j2 index 4c8dca9bb..905376338 100644 --- a/docker/glance/glance-base/Dockerfile.j2 +++ b/docker/glance/glance-base/Dockerfile.j2 @@ -38,10 +38,24 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.install_packages(glance_base_packages | customizable("packages")) }} {% elif install_type == 'source' %} - {% set glance_base_packages = [ - 'python-rados', - 'python-rbd' - ] %} + {% if base_package_type == 'rpm' %} + {% if distro_python_version.startswith('3') %} + {% set glance_base_packages = [ + 'python3-rados', + 'python3-rbd' + ] %} + {% else %} + {% set glance_base_packages = [ + 'python-rados', + 'python-rbd' + ] %} + {% endif %} + {% elif base_package_type == 'deb' %} + {% set glance_base_packages = [ + 'python3-rados', + 'python3-rbd' + ] %} + {% endif %} {{ macros.install_packages(glance_base_packages | customizable("packages")) }} diff --git a/docker/gnocchi/gnocchi-base/Dockerfile.j2 b/docker/gnocchi/gnocchi-base/Dockerfile.j2 index ee3c389e3..5dfa3cdb9 100644 --- a/docker/gnocchi/gnocchi-base/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-base/Dockerfile.j2 @@ -96,9 +96,9 @@ RUN mkdir -p /var/www/cgi-bin/gnocchi \ {% set gnocchi_base_packages = [ 'apache2', - 'libapache2-mod-wsgi', + 'libapache2-mod-wsgi-py3', 'librados-dev', - 'python-ldappool' + 'python3-ldappool' ] %} # on x86-64 pip grabs precompiled numpy/scipy - on aarch64/ppc64le diff --git a/docker/heat/heat-base/Dockerfile.j2 b/docker/heat/heat-base/Dockerfile.j2 index 2a73abbfd..fa9033733 100644 --- a/docker/heat/heat-base/Dockerfile.j2 +++ b/docker/heat/heat-base/Dockerfile.j2 @@ -56,7 +56,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ {% set heat_base_packages = [ 'apache2', - 'libapache2-mod-wsgi' + 'libapache2-mod-wsgi-py3' ] %} {{ macros.install_packages(heat_base_packages | customizable("packages")) }} diff --git a/docker/helm-repository/Dockerfile.j2 b/docker/helm-repository/Dockerfile.j2 index 287fb0f15..091cc5b1f 100644 --- a/docker/helm-repository/Dockerfile.j2 +++ b/docker/helm-repository/Dockerfile.j2 @@ -22,7 +22,7 @@ ENV helm_version=2.3.0 \ {% set helm_repo_packages = [ 'git', 'jq', - 'python-pip' + 'python3-pip' ] %} {% endif %} diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index cda759521..b7e91db9a 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -83,7 +83,7 @@ RUN echo > /etc/apache2/ports.conf \ && cp /usr/share/openstack-dashboard/openstack_dashboard/conf/*.json /etc/openstack-dashboard \ && cp /usr/share/openstack-dashboard/manage.py /usr/bin/manage.py \ && rm /etc/apache2/conf-enabled/openstack-dashboard.conf \ - && for locale in /usr/lib/python{{distro_python_version}}/site-packages/*/locale; do \ + && for locale in /usr/lib/python3/dist-packages/*/locale; do \ (cd ${locale%/*} && /usr/bin/python3 /usr/bin/manage.py compilemessages) \ done {% endblock %} @@ -115,7 +115,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ {% set horizon_packages = [ 'apache2', 'gettext', - 'libapache2-mod-wsgi', + 'libapache2-mod-wsgi-py3', 'locales', 'tzdata' ] %} diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index 19681affb..9a937f49e 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -11,7 +11,11 @@ if [[ ${KOLLA_INSTALL_TYPE} == "binary" ]] && [[ "${KOLLA_BASE_DISTRO}" =~ ubunt fi if [[ ${KOLLA_INSTALL_TYPE} == "binary" ]]; then - SITE_PACKAGES="/usr/lib/python${KOLLA_DISTRO_PYTHON_VERSION}/site-packages" + if [[ ${KOLLA_BASE_DISTRO} == "debian" ]] || [[ ${KOLLA_BASE_DISTRO} == "ubuntu" ]]; then + SITE_PACKAGES="/usr/lib/python3/dist-packages" + else + SITE_PACKAGES="/usr/lib/python${KOLLA_DISTRO_PYTHON_VERSION}/site-packages" + fi elif [[ ${KOLLA_INSTALL_TYPE} == "source" ]]; then SITE_PACKAGES="/var/lib/kolla/venv/lib/python${KOLLA_DISTRO_PYTHON_VERSION}/site-packages" fi diff --git a/docker/ironic/ironic-api/Dockerfile.j2 b/docker/ironic/ironic-api/Dockerfile.j2 index bd8667192..e9d97fdf0 100644 --- a/docker/ironic/ironic-api/Dockerfile.j2 +++ b/docker/ironic/ironic-api/Dockerfile.j2 @@ -39,7 +39,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% elif base_package_type == 'deb' %} {% set ironic_api_packages = [ 'apache2', - 'libapache2-mod-wsgi' + 'libapache2-mod-wsgi-py3' ] %} {% endif %} diff --git a/docker/keystone/keystone-base/Dockerfile.j2 b/docker/keystone/keystone-base/Dockerfile.j2 index 85d98a834..5a4e8eddf 100644 --- a/docker/keystone/keystone-base/Dockerfile.j2 +++ b/docker/keystone/keystone-base/Dockerfile.j2 @@ -85,8 +85,8 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ 'apache2', 'libapache2-mod-auth-mellon', 'libapache2-mod-auth-openidc', - 'libapache2-mod-wsgi', - 'python-ldappool' + 'libapache2-mod-wsgi-py3', + 'python3-ldappool' ] %} {{ macros.install_packages(keystone_base_packages | customizable("packages")) }} RUN echo > /etc/apache2/ports.conf diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 72de96e6a..50f0095fd 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -41,7 +41,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'libssl-dev', 'libxslt1-dev', 'mariadb-client', - 'python-dev' + 'python3-dev' ] %} {% endif %} {{ macros.install_packages(kolla_toolbox_packages | customizable("packages")) }} diff --git a/docker/kube/kube-controller-manager/Dockerfile.j2 b/docker/kube/kube-controller-manager/Dockerfile.j2 index d2487d5f7..ae7fc7ffe 100644 --- a/docker/kube/kube-controller-manager/Dockerfile.j2 +++ b/docker/kube/kube-controller-manager/Dockerfile.j2 @@ -13,7 +13,10 @@ ENV KUBERNETES_COMPONENT=kube-controller-manager ] %} {% elif base_package_type == 'deb' %} {% set ceph_support_packages = [ - 'ceph-common' + 'ceph-common', + 'python3-cephfs', + 'python3-rados', + 'python3-rbd' ] %} {% endif %} {{ macros.install_packages(ceph_support_packages | customizable("packages")) }} diff --git a/docker/kubetoolbox/Dockerfile.j2 b/docker/kubetoolbox/Dockerfile.j2 index 34f7695a9..87481d102 100644 --- a/docker/kubetoolbox/Dockerfile.j2 +++ b/docker/kubetoolbox/Dockerfile.j2 @@ -11,6 +11,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'jq' ] %} +{% if base_package_type == 'deb' %} + {% set kubetoolbox_packages = kubetoolbox_packages + [ + 'python3-cephfs', + 'python3-rados', + 'python3-rbd' + ] %} +{% endif %} + {{ macros.install_packages(kubetoolbox_packages | customizable("packages")) }} {% block kubetoolbox_install_kube_binary %} diff --git a/docker/manila/manila-api/Dockerfile.j2 b/docker/manila/manila-api/Dockerfile.j2 index 8e6f30080..3b108b350 100644 --- a/docker/manila/manila-api/Dockerfile.j2 +++ b/docker/manila/manila-api/Dockerfile.j2 @@ -54,7 +54,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ {% elif base_package_type == 'deb' %} {% set manila_api_packages = [ 'apache2', - 'libapache2-mod-wsgi' + 'libapache2-mod-wsgi-py3' ] %} {{ macros.install_packages(manila_api_packages | customizable("packages")) }} RUN echo > /etc/apache2/ports.conf diff --git a/docker/manila/manila-share/Dockerfile.j2 b/docker/manila/manila-share/Dockerfile.j2 index cf58a36f0..702b4d91f 100644 --- a/docker/manila/manila-share/Dockerfile.j2 +++ b/docker/manila/manila-share/Dockerfile.j2 @@ -33,6 +33,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% elif base_package_type == 'deb' %} {% set manila_share_packages = [ 'ceph-common', + 'python3-rados', + 'python3-rbd', 'sqlite3' ] %} diff --git a/docker/mistral/mistral-api/Dockerfile.j2 b/docker/mistral/mistral-api/Dockerfile.j2 index 809dc3814..26752a774 100644 --- a/docker/mistral/mistral-api/Dockerfile.j2 +++ b/docker/mistral/mistral-api/Dockerfile.j2 @@ -49,7 +49,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ {% elif base_package_type == 'deb' %} {% set mistral_api_packages = [ 'apache2', - 'libapache2-mod-wsgi' + 'libapache2-mod-wsgi-py3' ] %} {{ macros.install_packages(mistral_api_packages | customizable("packages")) }} diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index fb5af658f..26b3f5cc4 100644 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ b/docker/neutron/neutron-base/Dockerfile.j2 @@ -115,7 +115,7 @@ RUN mkdir -p /usr/share/neutron \ 'keepalived', 'net-tools', 'openvswitch-switch', - 'python-openvswitch', + 'python3-openvswitch', 'radvd', 'uuid-runtime' ] %} diff --git a/docker/nova/nova-api/Dockerfile.j2 b/docker/nova/nova-api/Dockerfile.j2 index 9024d9387..d000fae70 100644 --- a/docker/nova/nova-api/Dockerfile.j2 +++ b/docker/nova/nova-api/Dockerfile.j2 @@ -58,7 +58,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ {% set nova_api_packages = [ 'apache2', - 'libapache2-mod-wsgi' + 'libapache2-mod-wsgi-py3' ] %} {{ macros.install_packages(nova_api_packages | customizable("packages")) }} diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2 index 7516e5ce6..804f1644f 100644 --- a/docker/nova/nova-base/Dockerfile.j2 +++ b/docker/nova/nova-base/Dockerfile.j2 @@ -85,7 +85,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'iptables', 'openssh-client', 'openvswitch-switch', - 'python-libvirt' + 'python3-libvirt' ] %} {% if base_arch == 'x86_64' %} {% set nova_base_packages = nova_base_packages + [ diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index 6ddc2e5b3..e4f3aa5c3 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -100,9 +100,12 @@ RUN rm -f /etc/nova/nova-compute.conf 'nfs-common', 'open-iscsi', 'parted', - 'python-guestfs', - 'python-libvirt', - 'python-rtslib-fb', + 'python3-cephfs', + 'python3-guestfs', + 'python3-libvirt', + 'python3-rados', + 'python3-rbd', + 'python3-rtslib-fb', 'qemu-utils', 'targetcli-fb' ] %} diff --git a/docker/octavia/octavia-api/Dockerfile.j2 b/docker/octavia/octavia-api/Dockerfile.j2 index cebdd2e54..a9967524b 100644 --- a/docker/octavia/octavia-api/Dockerfile.j2 +++ b/docker/octavia/octavia-api/Dockerfile.j2 @@ -46,7 +46,7 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% elif base_package_type == 'deb' %} {% set octavia_api_packages = [ 'apache2', - 'libapache2-mod-wsgi' + 'libapache2-mod-wsgi-py3' ] %} {% endif %} diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index edc07e73d..03c64fc7d 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -256,7 +256,7 @@ ENV DEBIAN_FRONTEND noninteractive 'libyaml-dev', 'libz-dev', 'pkg-config', - 'python-dev', + 'python3-dev', 'zip' ] %} @@ -295,7 +295,6 @@ ENV DEBIAN_FRONTEND noninteractive 'eventlet', 'fasteners', 'funcsigs', - 'futures', 'futurist', 'gnocchiclient', 'greenlet', @@ -379,7 +378,8 @@ ENV DEBIAN_FRONTEND noninteractive {% if distro_python_version == '2.7' %} {% set openstack_base_pip_packages = openstack_base_pip_packages + [ 'enum34', - 'functools32' + 'functools32', + 'futures' ] %} {% endif %} diff --git a/docker/panko/panko-base/Dockerfile.j2 b/docker/panko/panko-base/Dockerfile.j2 index 8111c616c..fa7780cd3 100644 --- a/docker/panko/panko-base/Dockerfile.j2 +++ b/docker/panko/panko-base/Dockerfile.j2 @@ -64,8 +64,8 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ {% set panko_base_packages = [ 'apache2', - 'libapache2-mod-wsgi', - 'python-ldappool' + 'libapache2-mod-wsgi-py3', + 'python3-ldappool' ] %} {{ macros.install_packages(panko_base_packages | customizable("packages")) }} diff --git a/docker/placement/placement-api/Dockerfile.j2 b/docker/placement/placement-api/Dockerfile.j2 index b18d7e1e3..25c732014 100644 --- a/docker/placement/placement-api/Dockerfile.j2 +++ b/docker/placement/placement-api/Dockerfile.j2 @@ -56,7 +56,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ {% set placement_api_packages = [ 'apache2', - 'libapache2-mod-wsgi' + 'libapache2-mod-wsgi-py3' ] %} {{ macros.install_packages(placement_api_packages | customizable("packages")) }} diff --git a/docker/vitrage/vitrage-base/Dockerfile.j2 b/docker/vitrage/vitrage-base/Dockerfile.j2 index 2e60607e0..689ef3729 100644 --- a/docker/vitrage/vitrage-base/Dockerfile.j2 +++ b/docker/vitrage/vitrage-base/Dockerfile.j2 @@ -56,8 +56,8 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ {% set vitrage_base_packages = [ 'apache2', - 'libapache2-mod-wsgi', - 'python-ldappool' + 'libapache2-mod-wsgi-py3', + 'python3-ldappool' ] %} {{ macros.install_packages(vitrage_base_packages | customizable("packages")) }} diff --git a/docker/zaqar/zaqar-base/Dockerfile.j2 b/docker/zaqar/zaqar-base/Dockerfile.j2 index d8f42752d..19dc11e1a 100644 --- a/docker/zaqar/zaqar-base/Dockerfile.j2 +++ b/docker/zaqar/zaqar-base/Dockerfile.j2 @@ -76,8 +76,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% elif base_package_type == 'deb' %} {% set zaqar_base_packages = [ 'apache2', - 'libapache2-mod-wsgi', - 'python-ldappool' + 'libapache2-mod-wsgi-py3', + 'python3-ldappool' ] %} {{ macros.install_packages(zaqar_base_packages | customizable("packages")) }} \ diff --git a/docker/zun/zun-base/Dockerfile.j2 b/docker/zun/zun-base/Dockerfile.j2 index 4bb10bcd3..cb31c9ef8 100644 --- a/docker/zun/zun-base/Dockerfile.j2 +++ b/docker/zun/zun-base/Dockerfile.j2 @@ -42,9 +42,9 @@ RUN mkdir -p /var/www/cgi-bin/zun \ {% set zun_base_packages = [ 'apache2', - 'libapache2-mod-wsgi', + 'libapache2-mod-wsgi-py3', 'numactl', - 'python-ldappool' + 'python3-ldappool' ] %} {{ macros.install_packages(zun_base_packages | customizable("packages")) }} |