[libvirt-ci PATCH 09/12] lcitool: Drop the get_root_password_file() method

Erik Skultety eskultet at redhat.com
Wed May 6 12:05:59 UTC 2020


We can now access this value directly in the config dictionary.

Signed-off-by: Erik Skultety <eskultet at redhat.com>
---
 guests/lcitool | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/guests/lcitool b/guests/lcitool
index 9c1a722..0725be9 100755
--- a/guests/lcitool
+++ b/guests/lcitool
@@ -232,22 +232,6 @@ class Config:
 
         return vault_pass_file
 
-    def get_root_password_file(self):
-        root_pass_file = self._get_config_file("root-password")
-
-        try:
-            with open(root_pass_file, "r") as infile:
-                if not infile.readline().strip():
-                    raise ValueError
-        except Exception as ex:
-            raise Exception(
-                "Missing or invalid root password file ({}): {}".format(
-                    root_pass_file, ex
-                )
-            )
-
-        return root_pass_file
-
     def get_gitlab_runner_token_file(self):
         if self.values["install"]["flavor"] != "gitlab":
             return None
@@ -516,7 +500,6 @@ class Application:
         base = Util.get_base()
 
         vault_pass_file = self._config.get_vault_password_file()
-        root_pass_file = self._config.get_root_password_file()
         gitlab_url_file = self._config.get_gitlab_url_file()
         gitlab_runner_token_file = self._config.get_gitlab_runner_token_file()
 
-- 
2.25.3




More information about the libvir-list mailing list