openstack/kolla-ansible
Code Issues Proposed changes

Fix proxysql get mariadb_backup_database_password

Browse Source 
Implements: Kolla Ansible
Closes-Bug: #2043554
Change-Id: I5648a79b4aa1960f1984a5179e3dfc3f0982c709
This commit is contained in:
Petr Slavchenkov 2023-11-15 07:41:13 +00:00
parent cea076f379
commit ef0f5a05c9
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
kolla_ansible/database_shards.py
View File

@ -121,6 +121,7 @@ def database_shards_info(context, hostnames):
raise FilterError("'mariadb_shard_backup_user_prefix' "
"variable is unavailable")
db_user = f"{db_backup_prefix}{host_shard_id}"
db_password = host.get('mariadb_backup_database_password')
user_dict = {'password': db_password, 'user': db_user,
'shard_id': host_shard_id}
shards_info['users'].append(user_dict)

14
kolla_ansible/tests/unit/test_database_filters.py
View File

@ -53,6 +53,7 @@ class TestKollaDatabaseShardsInfoFilter(unittest.TestCase):
root_prefix = 'root_shard_'
backup_prefix = 'backup_shard_'
db_cred = 'SECRET'
backup_db_cred = 'SECRET1'
db_shards = ['0', '1']
context = self._make_context({
@ -62,6 +63,7 @@ class TestKollaDatabaseShardsInfoFilter(unittest.TestCase):
'mariadb_shard_id': db_shards[0],
'enable_mariabackup': enable_mariabackup,
'database_password': db_cred,
'mariadb_backup_database_password': backup_db_cred,
'mariadb_shard_root_user_prefix': root_prefix,
'mariadb_shard_backup_user_prefix': backup_prefix,
},
@ -69,6 +71,7 @@ class TestKollaDatabaseShardsInfoFilter(unittest.TestCase):
'mariadb_shard_id': db_shards[0],
'enable_mariabackup': enable_mariabackup,
'database_password': db_cred,
'mariadb_backup_database_password': backup_db_cred,
'mariadb_shard_root_user_prefix': root_prefix,
'mariadb_shard_backup_user_prefix': backup_prefix,
},
@ -76,6 +79,7 @@ class TestKollaDatabaseShardsInfoFilter(unittest.TestCase):
'mariadb_shard_id': db_shards[1],
'enable_mariabackup': enable_mariabackup,
'database_password': db_cred,
'mariadb_backup_database_password': backup_db_cred,
'mariadb_shard_root_user_prefix': root_prefix,
'mariadb_shard_backup_user_prefix': backup_prefix,
},
@ -103,7 +107,7 @@ class TestKollaDatabaseShardsInfoFilter(unittest.TestCase):
"user": f"{root_prefix}0"
},
{
"password": db_cred,
"password": backup_db_cred,
"shard_id": db_shards[0],
"user": f"{backup_prefix}0"
},
@ -113,7 +117,7 @@ class TestKollaDatabaseShardsInfoFilter(unittest.TestCase):
"user": f"{root_prefix}1"
},
{
"password": db_cred,
"password": backup_db_cred,
"shard_id": db_shards[1],
"user": f"{backup_prefix}1"
}
@ -188,6 +192,7 @@ class TestKollaDatabaseShardsInfoFilter(unittest.TestCase):
root_prefix_2 = 'batman_shard_'
backup_prefix = 'backupman_shard_'
db_cred = 'kRypTonyte'
backup_db_cred = 'kRypTonyte1'
db_shards = ['0', '1']
context = self._make_context({
@ -197,6 +202,7 @@ class TestKollaDatabaseShardsInfoFilter(unittest.TestCase):
'mariadb_shard_id': db_shards[0],
'enable_mariabackup': enable_mariabackup,
'database_password': db_cred,
'mariadb_backup_database_password': backup_db_cred,
'mariadb_shard_root_user_prefix': root_prefix,
'mariadb_shard_backup_user_prefix': backup_prefix,
},
@ -204,6 +210,7 @@ class TestKollaDatabaseShardsInfoFilter(unittest.TestCase):
'mariadb_shard_id': db_shards[0],
'enable_mariabackup': enable_mariabackup,
'database_password': db_cred,
'mariadb_backup_database_password': backup_db_cred,
'mariadb_shard_root_user_prefix': root_prefix,
'mariadb_shard_backup_user_prefix': backup_prefix,
},
@ -211,6 +218,7 @@ class TestKollaDatabaseShardsInfoFilter(unittest.TestCase):
'mariadb_shard_id': db_shards[1],
'enable_mariabackup': 'no',
'database_password': db_cred,
'mariadb_backup_database_password': backup_db_cred,
'mariadb_shard_root_user_prefix': root_prefix_2,
},
},
@ -237,7 +245,7 @@ class TestKollaDatabaseShardsInfoFilter(unittest.TestCase):
"user": f"{root_prefix}0"
},
{
"password": db_cred,
"password": backup_db_cred,
"shard_id": db_shards[0],
"user": f"{backup_prefix}0"
},

4
releasenotes/notes/Fix-proxysql-mariadb-backup-database-password-54f43ecf102fb897.yaml Normal file
View File

@ -0,0 +1,4 @@
---
fixes:
- |
Fix MariaDB backup if enable_proxysql is enable