openstack/kolla
Code Issues Proposed changes

Merge "Clean MariaDB/MySQL"

Browse Source
This commit is contained in:
Zuul 2022-01-20 20:51:22 +00:00 committed by Gerrit Code Review
commit f7ef6c243a
5 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker/barbican/barbican-base/Dockerfile.j2
View File

@ -29,7 +29,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% set barbican_base_pip_packages = [ {% set barbican_base_pip_packages = [
'/barbican', '/barbican',
'mysqlclient',
'pastedeploy', 'pastedeploy',
'python-barbicanclient', 'python-barbicanclient',
'uwsgi' 'uwsgi'

6
docker/kolla-toolbox/Dockerfile.j2
View File

@ -28,8 +28,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'libxml2-devel', 'libxml2-devel',
'libxslt-devel', 'libxslt-devel',
'make', 'make',
'mariadb',
'mariadb-devel',
'openssh-clients', 'openssh-clients',
'openssl-devel', 'openssl-devel',
'openvswitch', 'openvswitch',
@ -57,10 +55,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'git', 'git',
'jq', 'jq',
'libffi-dev', 'libffi-dev',
'libmariadb-dev-compat',
'libssl-dev', 'libssl-dev',
'libxslt1-dev', 'libxslt1-dev',
'mariadb-client',
'openvswitch-switch', 'openvswitch-switch',
'python3-dev', 'python3-dev',
'rabbitmq-server', 'rabbitmq-server',
@ -85,9 +81,9 @@ ENV PATH {{ virtualenv_path }}/bin:$PATH
'ansible-core==2.11.*', 'ansible-core==2.11.*',
'cmd2', 'cmd2',
'influxdb', 'influxdb',
'mysqlclient',
'os-client-config', 'os-client-config',
'pbr', 'pbr',
'pymysql',
'python-openstackclient', 'python-openstackclient',
'pytz', 'pytz',
'pyudev', 'pyudev',

2
docker/monasca/monasca-api/Dockerfile.j2
View File

@ -16,11 +16,9 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}
{% set monasca_api_packages = [ {% set monasca_api_packages = [
'mariadb',
] %} ] %}
{% elif base_package_type == 'deb' %} {% elif base_package_type == 'deb' %}
{% set monasca_api_packages = [ {% set monasca_api_packages = [
'mariadb-client',
] %} ] %}
{% endif %} {% endif %}
{{ macros.install_packages(monasca_api_packages | customizable("packages")) }} {{ macros.install_packages(monasca_api_packages | customizable("packages")) }}

4
docker/openstack-base/Dockerfile.j2
View File

@ -123,7 +123,6 @@ ENV DEBIAN_FRONTEND noninteractive
'python3-memcache', 'python3-memcache',
'python3-mistralclient', 'python3-mistralclient',
'python3-muranoclient', 'python3-muranoclient',
'python3-mysqldb',
'python3-openstackclient', 'python3-openstackclient',
'python3-oslo.log', 'python3-oslo.log',
'python3-osprofiler', 'python3-osprofiler',
@ -155,7 +154,6 @@ ENV DEBIAN_FRONTEND noninteractive
'libxslt-devel', 'libxslt-devel',
'libyaml-devel', 'libyaml-devel',
'make', 'make',
'mariadb-devel',
'mod_ssl', 'mod_ssl',
'openssl', 'openssl',
'openssl-devel', 'openssl-devel',
@ -176,7 +174,6 @@ ENV DEBIAN_FRONTEND noninteractive
'git', 'git',
'libapache2-mod-wsgi-py3', 'libapache2-mod-wsgi-py3',
'libffi-dev', 'libffi-dev',
'libmariadb-dev-compat',
'libpcre3-dev', 'libpcre3-dev',
'libpq-dev', 'libpq-dev',
'libssl-dev', 'libssl-dev',
@ -240,7 +237,6 @@ ENV DEBIAN_FRONTEND noninteractive
'kombu', 'kombu',
'logutils', 'logutils',
'monotonic', 'monotonic',
'mysqlclient',
'netaddr', 'netaddr',
'netifaces', 'netifaces',
'os-brick', 'os-brick',

4
docker/placement/placement-base/Dockerfile.j2
View File

@ -14,14 +14,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}
{% set placement_base_packages = [ {% set placement_base_packages = [
'mariadb',
'openstack-placement-common', 'openstack-placement-common',
] %} ] %}
{% elif base_package_type == 'deb' %} {% elif base_package_type == 'deb' %}
{% set placement_base_packages = [ {% set placement_base_packages = [
'mariadb-client',
'placement-common', 'placement-common',
] %} ] %}
@ -34,13 +32,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}
{% set placement_base_packages = [ {% set placement_base_packages = [
'mariadb',
] %} ] %}
{% elif base_package_type == 'deb' %} {% elif base_package_type == 'deb' %}
{% set placement_base_packages = [ {% set placement_base_packages = [
'mariadb-client',
] %} ] %}
{% endif %} {% endif %}