X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=modules%2Fopnfv%2Fdeployment%2Ffactory.py;h=1fd8d447bd4abf6250b89b1a1302fb8e692f9009;hb=abd754f9358035062d977c46b4e9e0a171cf5261;hp=e14783fe2f6978df0d155c33e364b6ae90acaee3;hpb=6ebcae56c76492c4cdf42141a7b60bae1991e6f3;p=releng.git diff --git a/modules/opnfv/deployment/factory.py b/modules/opnfv/deployment/factory.py index e14783fe2..1fd8d447b 100644 --- a/modules/opnfv/deployment/factory.py +++ b/modules/opnfv/deployment/factory.py @@ -9,9 +9,10 @@ from opnfv.deployment.apex import adapter as apex_adapter -from opnfv.deployment.compass import adapter as compass_adapter +from opnfv.deployment.compass import adapter_container as compass_adapter from opnfv.deployment.fuel import adapter as fuel_adapter from opnfv.deployment.osa import adapter as osa_adapter +from opnfv.deployment.daisy import adapter as daisy_adapter from opnfv.utils import opnfv_logger as logger logger = logger.Logger(__name__).getLogger() @@ -43,14 +44,18 @@ class Factory(object): installer_user=installer_user, installer_pwd=installer_pwd) elif installer.lower() == "compass": - return compass_adapter.CompassAdapter( + return compass_adapter.ContainerizedCompassAdapter( installer_ip=installer_ip, installer_user=installer_user, - installer_pwd=installer_pwd) + pkey_file=pkey_file) elif installer.lower() == "osa": return osa_adapter.OSAAdapter(installer_ip=installer_ip, installer_user=installer_user, pkey_file=pkey_file) + elif installer.lower() == "daisy": + return daisy_adapter.DaisyAdapter(installer_ip=installer_ip, + installer_user=installer_user, + installer_pwd=installer_pwd) else: raise Exception("Installer adapter is not implemented for " "the given installer.")