summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSzilard Cserey <szilard.cserey@gmail.com>2016-08-30 16:29:32 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-30 16:29:33 +0000
commit7cff3184b3cefae5894eeef78bb3490818bc8141 (patch)
treef1819ec9e978c16ee5ddd71ef020f2e640977c6b
parenta0f0fb312899a44e80ec0339a44497b6e1c94bff (diff)
parentf1e808677a29a157e009f33a1a5a024eaad2c021 (diff)
Merge "deploy: Delete old Fuel env if present"
-rwxr-xr-xdeploy/deploy.py15
1 files changed, 15 insertions, 0 deletions
diff --git a/deploy/deploy.py b/deploy/deploy.py
index 9e188ebe6..f491929e0 100755
--- a/deploy/deploy.py
+++ b/deploy/deploy.py
@@ -109,6 +109,20 @@ class AutoDeploy(object):
self.iso_file = new_iso
self.install_iso()
+ def delete_old_fuel_env(self):
+ log('Delete old Fuel Master environments if present')
+ try:
+ old_dep = CloudDeploy(self.dea, self.dha, self.fuel_conf['ip'],
+ self.fuel_username, self.fuel_password,
+ self.dea_file, self.fuel_plugins_conf_dir,
+ WORK_DIR, self.no_health_check,
+ self.deploy_timeout,
+ self.no_deploy_environment, self.deploy_log)
+ with old_dep.ssh:
+ old_dep.check_previous_installation()
+ except Exception as e:
+ log('Could not delete old env: %s' % str(e))
+
def install_iso(self):
fuel = InstallFuelMaster(self.dea_file, self.dha_file,
self.fuel_conf['ip'], self.fuel_username,
@@ -226,6 +240,7 @@ class AutoDeploy(object):
def deploy(self):
self.collect_fuel_info()
if not self.no_fuel:
+ self.delete_old_fuel_env()
self.setup_execution_environment()
self.create_tmp_dir()
self.install_fuel_master()