summaryrefslogtreecommitdiffstats
path: root/fuel/deploy/deploy_env.py
diff options
context:
space:
mode:
authorSzilard Cserey <szilard.cserey@ericsson.com>2015-09-18 12:13:46 +0200
committerSzilard Cserey <szilard.cserey@ericsson.com>2015-09-18 17:21:02 +0200
commit84685cffebe90c64a1197b8711623ff779dd1ba1 (patch)
treeee1e5c6575c782ff7cc4b1fa816fd45dee8903a5 /fuel/deploy/deploy_env.py
parente3d65c21d1e99c30af8af52ebad8e587d86f9a8d (diff)
FIX for temporary ISO directory cleanup
Move plugin installation in Fuel installer Change-Id: Ibb24da448681fb70686a1f59738bd9fdda12e9d0 Signed-off-by: Szilard Cserey <szilard.cserey@ericsson.com>
Diffstat (limited to 'fuel/deploy/deploy_env.py')
-rw-r--r--fuel/deploy/deploy_env.py19
1 files changed, 3 insertions, 16 deletions
diff --git a/fuel/deploy/deploy_env.py b/fuel/deploy/deploy_env.py
index 4953bde..fb3cf12 100644
--- a/fuel/deploy/deploy_env.py
+++ b/fuel/deploy/deploy_env.py
@@ -30,20 +30,18 @@ RO = common.RO
CLOUD_DEPLOY_FILE = 'deploy.py'
BLADE_RESTART_TIMES = 3
-PLUGINS_DIR = '~/plugins'
class CloudDeploy(object):
def __init__(self, dea, dha, fuel_ip, fuel_username, fuel_password,
- dea_file, fuel_plugins_dir, work_dir, no_health_check):
+ dea_file, work_dir, no_health_check):
self.dea = dea
self.dha = dha
self.fuel_ip = fuel_ip
self.fuel_username = fuel_username
self.fuel_password = fuel_password
self.dea_file = dea_file
- self.fuel_plugins_dir = fuel_plugins_dir
self.work_dir = work_dir
self.no_health_check = no_health_check
self.file_dir = os.path.dirname(os.path.realpath(__file__))
@@ -66,14 +64,6 @@ class CloudDeploy(object):
for f in glob.glob('%s/cloud/*' % self.file_dir):
s.scp_put(f, self.work_dir)
- def upload_plugin_files(self):
- with self.ssh as s:
- s.exec_cmd('rm -rf %s' % PLUGINS_DIR, False)
- s.exec_cmd('mkdir %s' % PLUGINS_DIR)
- if self.fuel_plugins_dir:
- for f in glob.glob('%s/*.rpm' % self.fuel_plugins_dir):
- s.scp_put(f, PLUGINS_DIR)
-
def power_off_nodes(self):
for node_id in self.node_ids:
self.dha.node_power_off(node_id)
@@ -98,10 +88,9 @@ class CloudDeploy(object):
blade_node_file = '%s/%s' % (
self.work_dir, os.path.basename(self.blade_node_file))
with self.ssh as s:
- status = s.run('python %s %s %s %s %s'
+ status = s.run('python %s %s %s %s'
% (('-nh' if self.no_health_check else ''),
- deploy_app, dea_file, blade_node_file,
- PLUGINS_DIR))
+ deploy_app, dea_file, blade_node_file))
return status
def check_supported_release(self):
@@ -253,6 +242,4 @@ class CloudDeploy(object):
self.upload_cloud_deployment_files()
- self.upload_plugin_files()
-
return self.run_cloud_deploy(CLOUD_DEPLOY_FILE)