Add fleet and sw-catalogs repo URLs to GitopsConfig to properly load them from env

Change-Id: Ia2d204bb1a3460c460fe660f4dfe2cca426d164f
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>

diff --git a/osm_lcm/data_utils/lcm_config.py b/osm_lcm/data_utils/lcm_config.py
index 224b4a4..ac66808 100644 (file)
--- a/osm_lcm/data_utils/lcm_config.py
+++ b/osm_lcm/data_utils/lcm_config.py
@@ -208,6 +208,8 @@ class MonitoringConfig(OsmConfigman):
 
 class GitopsConfig(OsmConfigman):
     git_base_url: str = None
+    fleet_repo_url: str = None
+    sw_catalogs_repo_url: str = None
     user: str = None
     pubkey: str = None
     mgmtcluster_kubeconfig: str = None

diff --git a/osm_lcm/odu_workflows.py b/osm_lcm/odu_workflows.py
index 4676ccb..ccaaf33 100644 (file)
--- a/osm_lcm/odu_workflows.py
+++ b/osm_lcm/odu_workflows.py
@@ -51,10 +51,10 @@ class OduWorkflow(LcmBase):
         self.gitops_config = config["gitops"]
         self.logger.debug(f"Config: {self.gitops_config}")
         self._odu_checkloop_retry_time = 15
-        self._kubeconfig = self.gitops_config["mgmtcluster_kubeconfig"]
+        self._kubeconfig = self.gitops_config.get("mgmtcluster_kubeconfig")
         self._kubectl = kubectl.Kubectl(config_file=self._kubeconfig)
-        self._repo_base_url = self.gitops_config["git_base_url"]
-        self._repo_user = self.gitops_config["user"]
+        self._repo_base_url = self.gitops_config.get("git_base_url")
+        self._repo_user = self.gitops_config.get("user")
         self._repo_fleet_url = self.gitops_config.get(
             "fleet_repo_url", f"{self._repo_base_url}/{self._repo_user}/fleet-osm.git"
         )