From f19a766d430101f68b1b7ed31a8c1c64293afaa7 Mon Sep 17 00:00:00 2001 From: Trent Lloyd Date: Fri, 22 Jun 2018 12:57:26 +0800 Subject: [PATCH] Use correct SST password in backup action The backup action currently retrieves the sst-password from the charm configuration exclusively, instead of the leader settings where it is usually stored when auto-generated. Always retrieve the correct SST password using the percona_utils._get_password function. Change-Id: I06d36c13ecc48a942e559d09d94e7813a2254479 --- actions/actions.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/actions/actions.py b/actions/actions.py index 8a95064..8870bba 100755 --- a/actions/actions.py +++ b/actions/actions.py @@ -12,7 +12,6 @@ from charmhelpers.core.hookenv import ( action_get, action_set, action_fail, - config, ) from charmhelpers.core.host import ( @@ -24,6 +23,7 @@ from percona_utils import ( pause_unit_helper, resume_unit_helper, register_configs, + _get_password, ) from percona_hooks import config_changed @@ -51,7 +51,7 @@ def backup(args): basedir = (action_get("basedir")).lower() compress = action_get("compress") incremental = action_get("incremental") - sstpw = config("sst-password") + sstpw = _get_password("sst-password") optionlist = [] # innobackupex will not create recursive dirs that do not already exist,