diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2026-07-06 15:26:00 +0200 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2026-07-06 19:59:40 +0000 |
| commit | db35ac8d793506bc43b62e7e39d27a75de1043ed (patch) | |
| tree | feec28d13a43490f5fd4260374144a1abfc20331 /docker/proxysql | |
| parent | 1ae1850557e3b99902f73b32c9005618537a1f2d (diff) | |
| download | kolla-db35ac8d793506bc43b62e7e39d27a75de1043ed.tar.gz kolla-db35ac8d793506bc43b62e7e39d27a75de1043ed.zip | |
Migrate to pyproject.toml
[tool.setuptools.data-files] does not support recursive directory
installation. The old setup.cfg [files] worked because PBR's
FilesConfig.expand_globs() used os.walk() to expand docker/*, but
this hook is not triggered by the pbr.build PEP-517 backend.
Move docker/ into kolla/ and use [tool.setuptools.package-data]
instead. Update kolla_worker._get_images_dir() to check the kolla
package directory first so both editable and regular installs work.
Change-Id: I4fc452c03740ef22ebbb4e8d0d86c4f4783e2d09
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
Diffstat (limited to 'docker/proxysql')
| -rw-r--r-- | docker/proxysql/Dockerfile.j2 | 43 | ||||
| -rw-r--r-- | docker/proxysql/kolla_extend_start | 21 | ||||
| -rw-r--r-- | docker/proxysql/kolla_proxysql_config_sync | 162 |
3 files changed, 0 insertions, 226 deletions
diff --git a/docker/proxysql/Dockerfile.j2 b/docker/proxysql/Dockerfile.j2 deleted file mode 100644 index a76dbcda8..000000000 --- a/docker/proxysql/Dockerfile.j2 +++ /dev/null @@ -1,43 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" -{% endblock %} - -{% block proxysql_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.enable_extra_repos(['proxysql']) }} - -{% set proxysql_packages = [ - 'proxysql', -] %} - -{% if base_package_type == 'rpm' %} - {% set proxysql_packages = proxysql_packages + [ - 'python3-PyYAML', - ] %} -{% elif base_package_type == 'deb' %} - {% set proxysql_packages = proxysql_packages + [ - 'python3-yaml', - ] %} -{% endif %} - -{{ macros.configure_user(name='proxysql') }} -{{ macros.install_packages(proxysql_packages | customizable("packages")) }} - -COPY kolla_proxysql_config_sync kolla_extend_start /usr/local/bin/ -RUN chmod 755 /usr/local/bin/kolla_proxysql_config_sync \ - && chmod 644 /usr/local/bin/kolla_extend_start - -RUN install -g proxysql -o proxysql -m 770 -d /var/lib/kolla/proxysql \ - && touch /etc/proxysql.cnf \ - && chown proxysql:proxysql /etc/proxysql.cnf \ - && chmod 600 /etc/proxysql.cnf - -{{ macros.kolla_patch_sources() }} - -{% block proxysql_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER proxysql diff --git a/docker/proxysql/kolla_extend_start b/docker/proxysql/kolla_extend_start deleted file mode 100644 index 229e8ada2..000000000 --- a/docker/proxysql/kolla_extend_start +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -PROXYSQL_LIB_DIR="/var/lib/proxysql" -PROXYSQL_LOG_DIR="/var/log/kolla/proxysql" - -if [[ ! -d "${PROXYSQL_LOG_DIR}" ]]; then - mkdir -p "${PROXYSQL_LOG_DIR}" -fi -chown -R proxysql:kolla "${PROXYSQL_LOG_DIR}" - -# Remove old pid -rm -f ${PROXYSQL_LIB_DIR}/proxysql.pid - -# As proxysql supports only one -# configuration file, there is a -# script which reads global and services -# configs (similar to haproxy) and -# generate single configuration file -# from which is internal DB created -# every time. -kolla_proxysql_config_sync diff --git a/docker/proxysql/kolla_proxysql_config_sync b/docker/proxysql/kolla_proxysql_config_sync deleted file mode 100644 index 094642c8a..000000000 --- a/docker/proxysql/kolla_proxysql_config_sync +++ /dev/null @@ -1,162 +0,0 @@ -#!/usr/bin/python3 - -# Copyright 2021 Michal Arbet -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import logging -import os -import yaml - -# Default paths -PROXYSQL_CONFIG_DIR = "/etc/proxysql" -PROXYSQL_CONFIG = "/etc/proxysql.cnf" - -# Logging -log_format = '%(asctime)s,%(msecs)d %(name)s %(levelname)s %(message)s' -logging.basicConfig(format=log_format, - datefmt='%H:%M:%S', - level=logging.DEBUG) -LOG = logging.getLogger("proxysql_config_sync") - - -class ProxySQLConfig: - - def __init__(self, conf_dir, conf_file): - self.configs = dict() - self.config = dict() - self.configs['global'] = "{}/proxysql.yaml".format(conf_dir) - self.configs['users'] = "{}/users".format(conf_dir) - self.configs['rules'] = "{}/rules".format(conf_dir) - self.conf_file = conf_file - self._load_config() - - def _load_config(self): - users = dict() - rules = dict() - - for cfg, path in self.configs.items(): - if not os.path.isdir(path): - with open(path) as config_file: - self.config.update( - yaml.safe_load(config_file)) - else: - users['mysql_users'] = list() - rules['mysql_query_rules'] = list() - user_paths = [os.path.join(self.configs['users'], f) - for f in os.listdir(self.configs['users'])] - rule_paths = [os.path.join(self.configs['rules'], f) - for f in os.listdir(self.configs['rules'])] - - for user_conf in user_paths: - with open(user_conf) as config_file: - tmp_users = yaml.safe_load(config_file) - for i in tmp_users['mysql_users']: - users['mysql_users'].append(i) - self.config.update(users) - for rule_conf in rule_paths: - with open(rule_conf) as config_file: - tmp_rules = yaml.safe_load(config_file) - for i in tmp_rules['mysql_query_rules']: - rules['mysql_query_rules'].append(i) - self.config.update(rules) - self._sanity() - - def _sanity(self): - self._users_sanity() - self._rules_sanity() - - def _users_sanity(self): - users_added = list() - users = list() - for user in self.config['mysql_users']: - if user['username'] not in users_added: - users_added.append(user['username']) - users.append(user) - else: - LOG.warning("User {} already exist, ignoring." - .format(user['username'])) - self.config['mysql_users'] = users - - def _rules_sanity(self): - rules_added = list() - rules = list() - rule_id = 1 - for rule in self.config['mysql_query_rules']: - if 'schemaname' in rule: - key = f"schema:{rule['schemaname']}" - elif 'username' in rule: - key = f"user:{rule['username']}" - else: - LOG.warning( - f"Rule without schemaname or username found, skipping: {rule}" - ) - continue - - if key not in rules_added: - rules_added.append(key) - rule['rule_id'] = rule_id - rules.append(rule) - rule_id += 1 - else: - LOG.warning("Duplicate rule for {}, ignoring.".format(key)) - - self.config['mysql_query_rules'] = rules - - def _write_dict(self, key, value): - if not isinstance(value, list): - value = [value] - with open(self.conf_file, "a+") as f: - if key: - f.write("{} =\n".format(key)) - for i in range(len(value)): - f.write(" {\n") - for k, v in value[i].items(): - if isinstance(v, str): - v = '"{}"'.format(v) - f.write(" {} = {}\n".format(k, v)) - if i == len(value)-1: - f.write(" }\n") - else: - f.write(" },\n") - - def _write_list(self, key, values): - with open(self.conf_file, "a+") as f: - f.write("{} =\n".format(key)) - f.write("(\n") - self._write_dict(key=None, value=values) - with open(self.conf_file, "a+") as f: - f.write(")\n") - - def _write(self, key, value): - with open(self.conf_file, "a+") as f: - if isinstance(value, str): - value = '"{}"'.format(value) - f.write("{} = {}\n".format(key, value)) - - def write_config(self): - LOG.info("Writing config to {}".format(self.conf_file)) - with open(self.conf_file, 'wb') as f: - pass - for k, v in self.config.items(): - if isinstance(v, dict): - self._write_dict(k, v) - elif isinstance(v, list): - self._write_list(k, v) - else: - self._write(k, v) - - -if __name__ == "__main__": - config = ProxySQLConfig(PROXYSQL_CONFIG_DIR, PROXYSQL_CONFIG) - config.write_config() |
