Merge "jjb/releng: fix compass-container $DOCKERFILE"

[releng.git] / modules / opnfv / utils / Credentials.py

diff --git a/modules/opnfv/utils/Credentials.py b/modules/opnfv/utils/Credentials.py
index 1882692..141ecbd 100644 (file)
--- a/modules/opnfv/utils/Credentials.py
+++ b/modules/opnfv/utils/Credentials.py
@@ -47,7 +47,7 @@ class Credentials(object):
                                                     password)
 
     def __check_installer_name(self, installer):
-        if installer not in ("apex", "compass", "fuel", "joid"):
+        if installer not in ("apex", "compass", "daisy", "fuel", "joid"):
             return os.EX_CONFIG
         else:
             return os.EX_OK
@@ -69,11 +69,15 @@ class Credentials(object):
         # TODO
         pass
 
+    def __fetch_creds_daisy(self, target_path):
+        # TODO
+        pass
+
     def __fetch_creds_fuel(self, target_path):
         creds_file = '/root/openrc'
         try:
             self.handler.get_file_from_controller(creds_file, target_path)
-        except Exception, e:
+        except Exception as e:
             self.logger.error(
                 "Cannot get %s from controller. %e" % (creds_file, e))
         pass
@@ -95,6 +99,8 @@ class Credentials(object):
             self.__fetch_creds_apex(target_path)
         elif self.installer == "compass":
             self.__fetch_creds_compass(target_path)
+        elif self.installer == "daisy":
+            self.__fetch_creds_daisy(target_path)
         elif self.installer == "fuel":
             self.__fetch_creds_fuel(target_path)
         elif self.installer == "joid":