diff --git a/packstack/installer/core/drones.py b/packstack/installer/core/drones.py index 6fe85ffc7..c7c911ac8 100644 --- a/packstack/installer/core/drones.py +++ b/packstack/installer/core/drones.py @@ -13,6 +13,7 @@ # limitations under the License. import os +import shutil import stat import uuid import time @@ -40,7 +41,7 @@ class SshTarballTransferMixin(object): "tar -C %(res_dir)s -xpzf %(pack_dest)s" % args) try: script.execute() - except ScriptRuntimeError as ex: + except utils.ScriptRuntimeError as ex: # TO-DO: change to appropriate exception raise RuntimeError('Failed to copy resources to node %s. ' 'Reason: %s' % (node, ex)) diff --git a/packstack/installer/run_setup.py b/packstack/installer/run_setup.py index b12817147..2fb46b483 100644 --- a/packstack/installer/run_setup.py +++ b/packstack/installer/run_setup.py @@ -112,7 +112,7 @@ def _getInputFromUser(param): if (param.MASK_INPUT): userInput = getpass.getpass("%s :" % (param.PROMPT)) else: - userInput = raw_input(message.read()) + userInput = input(message.read()) else: userInput = commandLineValues[param.CONF_NAME] # If DEFAULT_VALUE is set and user did not input anything @@ -191,7 +191,7 @@ def _askYesNo(question=None): message.write(askString) message.seek(0) - raw = raw_input(message.read()) + raw = input(message.read()) if not len(raw): continue diff --git a/tests/installer/test_drones.py b/tests/installer/test_drones.py index 5251027db..2244dcb12 100644 --- a/tests/installer/test_drones.py +++ b/tests/installer/test_drones.py @@ -17,6 +17,7 @@ import os import shutil +import tarfile import tempfile from unittest import TestCase