diff options
author | Yifei Xue <xueyifei@huawei.com> | 2018-03-14 19:16:29 +0800 |
---|---|---|
committer | Yifei Xue <xueyifei@huawei.com> | 2018-03-15 16:23:56 +0800 |
commit | a22e99decc1d589bca0d66429e2b9bbd174af15b (patch) | |
tree | 02ba75c6558524ed38f88597793558bdfc00d8b2 /modules/opnfv/deployment/factory.py | |
parent | 7862b47133a7ec4f85cb8b3a1b8ea7452fe41bc1 (diff) |
Add a new adapter for containerized Compass installer
JIRA: -
Compass installer has been containerized since OPNFV 5.0.
To enable SFC test cases in Functest for Compass installer,
a new adapter is needed to be compatible with both containerized
Compass installer and SFC test cases.
Change-Id: I4e1a9e5fcbec016a0c3fde77ace9c2cc677e3e4c
Signed-off-by: Yifei Xue <xueyifei@huawei.com>
Diffstat (limited to 'modules/opnfv/deployment/factory.py')
-rw-r--r-- | modules/opnfv/deployment/factory.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/opnfv/deployment/factory.py b/modules/opnfv/deployment/factory.py index 2788e5eaa..1fd8d447b 100644 --- a/modules/opnfv/deployment/factory.py +++ b/modules/opnfv/deployment/factory.py @@ -9,7 +9,7 @@ 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 @@ -44,10 +44,10 @@ 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, |