[libvirt-ci PATCH 09/13] lcitool: Drop the gitlab-related getter methods

[Erik Skultety <eskultet@xxxxxxxxxx>]

We can now access the values directly in the config dictionary.

Signed-off-by: Erik Skultety <eskultet@xxxxxxxxxx>
---
 guests/lcitool                           | 44 ++----------------------
 guests/playbooks/update/tasks/gitlab.yml |  2 --
 2 files changed, 2 insertions(+), 44 deletions(-)

diff --git a/guests/lcitool b/guests/lcitool
index 6c905c2..f2b4d44 100755
--- a/guests/lcitool
+++ b/guests/lcitool
@@ -227,44 +227,6 @@ class Config:
 
         return vault_pass_file
 
-    def get_gitlab_runner_token_file(self):
-        if self.get_flavor() != "gitlab":
-            return None
-
-        gitlab_runner_token_file = self._get_config_file("gitlab-runner-token")
-
-        try:
-            with open(gitlab_runner_token_file, "r") as infile:
-                if not infile.readline().strip():
-                    raise ValueError
-        except Exception as ex:
-            raise Exception(
-                "Missing or invalid GitLab runner token file ({}): {}".format(
-                    gitlab_runner_token_file, ex
-                )
-            )
-
-        return gitlab_runner_token_file
-
-    def get_gitlab_url_file(self):
-        if self.get_flavor() != "gitlab":
-            return None
-
-        gitlab_url_file = self._get_config_file("gitlab-url")
-
-        try:
-            with open(gitlab_url_file, "r") as infile:
-                if not infile.readline().strip():
-                    raise ValueError
-        except Exception as ex:
-            raise Exception(
-                "Missing or invalid GitLab url file ({}): {}".format(
-                    gitlab_url_file, ex
-                )
-            )
-
-        return gitlab_url_file
-
 
 class Inventory:
 
@@ -495,8 +457,6 @@ class Application:
         base = Util.get_base()
 
         vault_pass_file = self._config.get_vault_password_file()
-        gitlab_url_file = self._config.get_gitlab_url_file()
-        gitlab_runner_token_file = self._config.get_gitlab_runner_token_file()
 
         ansible_hosts = ",".join(self._inventory.expand_pattern(hosts))
         selected_projects = self._projects.expand_pattern(projects)
@@ -529,8 +489,8 @@ class Application:
                 "selected_projects": selected_projects,
                 "git_remote": git_remote,
                 "git_branch": git_branch,
-                "gitlab_url_file": gitlab_url_file,
-                "gitlab_runner_token_file": gitlab_runner_token_file,
+                "gitlab_url": self._config.dict["gitlab"]["url"],
+                "gitlab_runner_secret": self._config.dict["gitlab"]["token"],
             }
             json.dump(extra_vars, fp)
 
diff --git a/guests/playbooks/update/tasks/gitlab.yml b/guests/playbooks/update/tasks/gitlab.yml
index 7691442..c13ca22 100644
--- a/guests/playbooks/update/tasks/gitlab.yml
+++ b/guests/playbooks/update/tasks/gitlab.yml
@@ -1,8 +1,6 @@
 ---
 - name: Define gitlab-related facts
   set_fact:
-    gitlab_url: '{{ lookup("file", gitlab_url_file) }}'
-    gitlab_runner_secret: '{{ lookup("file", gitlab_runner_token_file) }}'
     gitlab_runner_download_url: https://gitlab-runner-downloads.s3.amazonaws.com/latest/binaries/gitlab-runner-{{ ansible_system|lower }}-amd64
     gitlab_runner_config_dir: '/etc/gitlab-runner'
 
-- 
2.25.3