openstack
/
charm-percona-cluster
Code Issues Proposed changes

Ensure that correct password update is used for mysql version 

On mysql pre 5.7.5 and older (e.g. xenial) a different password update
SQL statement is needed.  Detect the ubuntu version (assuming the
packages are used) and use the version for that password.

Change-Id: Ifd73f20c2523de164fb23e8f5a5e757393d489e3
Closes-Bug: #1916672
This commit is contained in:
Alex Kavanagh 2021-02-25 12:16:28 +00:00 committed by Alex Kavanagh
parent af9c467e35
commit d55dcdebc9
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hooks/percona_utils.py
View File

@ -1828,8 +1828,7 @@ def create_nagios_user():
else:
log("User 'nagios'@'localhost' already exists.", level="WARNING")
# NOTE (rgildein): Update the user's password if it has changed.
m_helper.execute("ALTER USER 'nagios'@'localhost' IDENTIFIED BY "
"'{passwd}';".format(passwd=nagios_password()))
m_helper.set_mysql_password('nagios', nagios_password())
def set_nagios_user():

9
unit_tests/test_percona_utils.py
View File

@ -539,11 +539,14 @@ class UtilsTests(CharmTestCase):
mock_apt_update.assert_not_called()
@mock.patch.object(percona_utils, "lsb_release")
@mock.patch.object(percona_utils, "get_db_helper")
@mock.patch.object(percona_utils, "write_nagios_my_cnf")
def test_create_nagios_user(self,
mock_create_nagios_mysql_credential,
mock_get_db_helper):
mock_get_db_helper,
mock_lsb_release):
mock_lsb_release.return_value = {'DISTRIB_CODENAME': 'bionic'}
my_mock = mock.Mock()
self.leader_get.return_value = "1234"
self.is_leader.return_value = True
@ -555,8 +558,8 @@ class UtilsTests(CharmTestCase):
)
my_mock.execute.assert_has_calls([
mock.call("CREATE USER 'nagios'@'localhost';"),
mock.call("ALTER USER 'nagios'@'localhost' IDENTIFIED BY '1234';"),
])
my_mock.set_mysql_password.assert_called_once_with('nagios', '1234')
class OperationalError(Exception):
pass
@ -566,7 +569,7 @@ class UtilsTests(CharmTestCase):
def mysql_create_user(*args, **kwargs):
raise OperationalError()
my_mock.select.return_value = True
my_mock.select.return_value = False
my_mock.execute.side_effect = mysql_create_user
with self.assertRaises(OperationalError):
percona_utils.create_nagios_user()