diff options
| author |   Jose Lausuch <jose.lausuch@ericsson.com> | 2017-01-12 16:08:56 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-01-12 16:08:56 +0000 |
| commit | 1d67b000f5def7093ae41d63d0d52f07b74b4948 (patch) | |
| tree | 9a51aa988e7007dd1445a2cc07075c8e11f0afef /modules/opnfv/utils | |
| parent | 8d8493864406132bcc8e84a38a67b5fc3947d566 (diff) | |
| parent | d53bc21e5b8eed5fb24a0f994db289e2b50953f1 (diff) | |
Merge "Add a new installer daisy adapter to modules directory"
Diffstat (limited to 'modules/opnfv/utils')
| -rw-r--r-- | modules/opnfv/utils/Credentials.py | 8 | ||||
| -rw-r--r-- | modules/opnfv/utils/constants.py | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/modules/opnfv/utils/Credentials.py b/modules/opnfv/utils/Credentials.py index 1882692b3..6441b841c 100644 --- 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,6 +69,10 @@ 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: @@ -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": diff --git a/modules/opnfv/utils/constants.py b/modules/opnfv/utils/constants.py index 29f0d02c5..a69cedda3 100644 --- a/modules/opnfv/utils/constants.py +++ b/modules/opnfv/utils/constants.py @@ -7,7 +7,7 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 -INSTALLERS = ['apex', 'fuel', 'compass', 'joid'] +INSTALLERS = ['apex', 'fuel', 'compass', 'joid', "daisy"] VERSIONS = ['arno', 'brahmaputra', 'colorado', 'danube'] EXIT_OK = 0 |