From ae7f4ddc3ee2fa8a697fc1c50f1721058f30687a Mon Sep 17 00:00:00 2001
From: Michal Arbet <michal.arbet@ultimum.io>
Date: Thu, 28 Jul 2022 18:48:21 +0200
Subject: [PATCH] Add proxysql-config role and wrap it in loadbalancer-config
role
This patch ads proxysql-config role
which is used for generating users and
rules configuration.
Change-Id: I1fcb0e8040ea55f8f6b8384a56479eabdaf61c33
---
ansible/roles/loadbalancer-config/tasks/main.yml | 4 ++++
ansible/roles/proxysql-config/defaults/main.yml | 2 +-
ansible/roles/proxysql-config/tasks/main.yml | 6 ++----
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/ansible/roles/loadbalancer-config/tasks/main.yml b/ansible/roles/loadbalancer-config/tasks/main.yml
index 3718c38ab4..5658d85152 100644
--- a/ansible/roles/loadbalancer-config/tasks/main.yml
+++ b/ansible/roles/loadbalancer-config/tasks/main.yml
@@ -2,3 +2,7 @@
- import_role:
name: haproxy-config
when: haproxy_config_install | bool
+
+- import_role:
+ name: proxysql-config
+ when: enable_proxysql | bool
diff --git a/ansible/roles/proxysql-config/defaults/main.yml b/ansible/roles/proxysql-config/defaults/main.yml
index 36425a7249..085ceb80c1 100644
--- a/ansible/roles/proxysql-config/defaults/main.yml
+++ b/ansible/roles/proxysql-config/defaults/main.yml
@@ -1,5 +1,5 @@
---
-proxysql_project_database_shard: "{{ lookup('vars', (kolla_role_name | default(project_name)) + '_database_shard') }}"
+proxysql_project_database_shard: "{{ lookup('vars', (kolla_role_name | default(project_name)) + '_database_shard', default=omit) }}"
# NOTE(kevko): Kolla_role_name and replace is used only because of nova-cell
proxysql_project: "{{ kolla_role_name | default(project_name) | replace('_','-') }}"
proxysql_config_users: "{% if proxysql_project_database_shard is defined and proxysql_project_database_shard['users'] is defined %}True{% else %}False{% endif %}"
diff --git a/ansible/roles/proxysql-config/tasks/main.yml b/ansible/roles/proxysql-config/tasks/main.yml
index 2fb51a7236..78c416145c 100644
--- a/ansible/roles/proxysql-config/tasks/main.yml
+++ b/ansible/roles/proxysql-config/tasks/main.yml
@@ -1,24 +1,22 @@
---
-- name: "Copying over {{ proxysql_project }} users config"
+- name: "Copying over {{ proxysql_project }} ProxySQL users config"
template:
src: "users.yaml.j2"
dest: "{{ node_config_directory }}/proxysql/users/{{ proxysql_project }}.yaml"
mode: "0660"
become: true
when:
- - enable_proxysql | bool
- proxysql_config_users | bool
notify:
- Restart proxysql container
-- name: "Copying over {{ proxysql_project }} rules config"
+- name: "Copying over {{ proxysql_project }} ProxySQL rules config"
template:
src: "rules.yaml.j2"
dest: "{{ node_config_directory }}/proxysql/rules/{{ proxysql_project }}.yaml"
mode: "0660"
become: true
when:
- - enable_proxysql | bool
- proxysql_config_rules | bool
notify:
- Restart proxysql container