From 3e0539742ddfaf2cd2431d46de5a168bfc675a9d Mon Sep 17 00:00:00 2001 From: Jiri Podivin Date: Fri, 15 Jan 2021 15:16:42 +0100 Subject: [PATCH] Get gid and uid methods are now members of HeatBaseLauncher The class HeatBaseLauncher uses both methods during __init__. But doesn't actually define them. This would cause an error (either NameError or AttributeError) during instantiation. Signed-off-by: Jiri Podivin Change-Id: I55be5d3a3c24171fc7912e063f67fe2919590292 --- tripleoclient/heat_launcher.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tripleoclient/heat_launcher.py b/tripleoclient/heat_launcher.py index f7f9b8c3c..2a824cd6c 100644 --- a/tripleoclient/heat_launcher.py +++ b/tripleoclient/heat_launcher.py @@ -244,6 +244,12 @@ heat.filter_factory = heat.api.openstack:version_negotiation_filter with open(config_file, 'w') as temp_file: temp_file.write(ks_token) + def get_heat_uid(self): + return pwd.getpwnam(self.user).pw_uid + + def get_heat_gid(self): + return grp.getgrnam(self.user).gr_gid + class HeatContainerLauncher(HeatBaseLauncher): @@ -347,11 +353,5 @@ class HeatNativeLauncher(HeatBaseLauncher): subprocess.check_call(['heat-manage', '--config-file', self.config_file, 'db_sync']) - def get_heat_uid(self): - return pwd.getpwnam(self.user).pw_uid - - def get_heat_gid(self): - return grp.getgrnam(self.user).gr_gid - def kill_heat(self, pid): os.kill(pid, signal.SIGKILL)