summaryrefslogtreecommitdiffstats
path: root/modules/opnfv/installer_adapters/InstallerHandler.py
diff options
context:
space:
mode:
authorJose Lausuch <jose.lausuch@ericsson.com>2017-02-01 11:55:27 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-02-01 11:55:27 +0000
commit829036742bbb4c75d8528e9fbfc805ca00244b81 (patch)
tree04863ba199156ea7fce3eada1280633aa366534d /modules/opnfv/installer_adapters/InstallerHandler.py
parent800087dd804d8011303154754059087d55a7a549 (diff)
parent816695878485fb6cb8742e10c81f1d43b2052501 (diff)
Merge "Create Apex Adapter"
Diffstat (limited to 'modules/opnfv/installer_adapters/InstallerHandler.py')
-rw-r--r--modules/opnfv/installer_adapters/InstallerHandler.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/modules/opnfv/installer_adapters/InstallerHandler.py b/modules/opnfv/installer_adapters/InstallerHandler.py
index dc5bdb9d6..6c43a46f0 100644
--- a/modules/opnfv/installer_adapters/InstallerHandler.py
+++ b/modules/opnfv/installer_adapters/InstallerHandler.py
@@ -1,5 +1,5 @@
##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
+# Copyright (c) 2017 Ericsson AB and others.
# Author: Jose Lausuch (jose.lausuch@ericsson.com)
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Apache License, Version 2.0
@@ -23,18 +23,22 @@ class InstallerHandler:
installer,
installer_ip,
installer_user,
- installer_pwd=None):
+ installer_pwd=None,
+ private_key_file=None):
self.installer = installer.lower()
self.installer_ip = installer_ip
self.installer_user = installer_user
self.installer_pwd = installer_pwd
+ self.private_key_file = private_key_file
if self.installer == INSTALLERS[0]:
self.InstallerAdapter = FuelAdapter(self.installer_ip,
self.installer_user,
self.installer_pwd)
elif self.installer == INSTALLERS[1]:
- self.InstallerAdapter = ApexAdapter(self.installer_ip)
+ self.InstallerAdapter = ApexAdapter(installer_ip=self.installer_ip,
+ user=self.installer_user,
+ pkey_file=self.private_key_file)
elif self.installer == INSTALLERS[2]:
self.InstallerAdapter = CompassAdapter(self.installer_ip)
elif self.installer == INSTALLERS[3]: