simpler getSlaposConfiguration()

slapprepare/slapprepare/slapprepare.py

@@ -126,21 +126,16 @@ def get_yes_no(prompt, default=None):
 
 
 def getSlaposConfiguration(slapos_configuration_file_path=None):
-  config = ConfigParser.RawConfigParser()
-  # Search slapos.cfg
-  if not slapos_configuration_file_path:
-    slapos_configuration_file_path = "/etc/opt/slapos/slapos.cfg"
-  slapos_configuration_file_path_old = "/etc/slapos/slapos.cfg"
-
-  if not os.path.isfile(slapos_configuration_file_path):
-    if os.path.isfile(slapos_configuration_file_path_old):
-      slapos_configuration_file_path = slapos_configuration_file_path_old
-    else:
-      # No configuration found : returning
-      return {}
-  # Reading slapos paths from configuration file
-  config.read(slapos_configuration_file_path)
-  return config
+  for path in [
+        slapos_configuration_file_path,
+        '/etc/opt/slapos/slapos.cfg',
+        '/etc/slapos/slapos.cfg'
+    ]:
+    if path and os.path.isfile(path):
+      config = ConfigParser.RawConfigParser()
+      config.read(path)
+      return config
+  return {}
 
 
 # Return OpenSUSE version if it is SuSE