From 26705adaa343fdbef2440a35b438808ac34fded4 Mon Sep 17 00:00:00 2001 From: Nikolas Hermanns Date: Mon, 7 Mar 2016 13:31:16 +0100 Subject: Add no_deploy_environment option For development reason it is useable to have an option so that everything is done except the deploy of the openstack environment. Change-Id: I1f1b7f9c89ee8c9ceea96353e25a51eee53b955c --- deploy/deploy_env.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'deploy/deploy_env.py') diff --git a/deploy/deploy_env.py b/deploy/deploy_env.py index 3d1cdf430..aa861e102 100644 --- a/deploy/deploy_env.py +++ b/deploy/deploy_env.py @@ -35,7 +35,7 @@ class CloudDeploy(object): def __init__(self, dea, dha, fuel_ip, fuel_username, fuel_password, dea_file, fuel_plugins_conf_dir, work_dir, no_health_check, - deploy_timeout): + deploy_timeout, no_deploy_environment): self.dea = dea self.dha = dha self.fuel_ip = fuel_ip @@ -50,6 +50,7 @@ class CloudDeploy(object): self.work_dir = work_dir self.no_health_check = no_health_check self.deploy_timeout = deploy_timeout + self.no_deploy_environment = no_deploy_environment self.file_dir = os.path.dirname(os.path.realpath(__file__)) self.ssh = SSHClient(self.fuel_ip, self.fuel_username, self.fuel_password) @@ -105,10 +106,12 @@ class CloudDeploy(object): deploy_app = '%s/%s' % (self.work_dir, deploy_app) dea_file = '%s/%s' % (self.work_dir, os.path.basename(self.dea_file)) with self.ssh as s: - status = s.run('python %s %s %s %s' % ( + status = s.run('python %s %s %s %s %s' % ( deploy_app, ('-nh' if self.no_health_check else ''), - ('-dt %s' % self.deploy_timeout if self.deploy_timeout else ''), + ('-dt %s' % + self.deploy_timeout if self.deploy_timeout else ''), + ('-nde' if self.no_deploy_environment else ''), dea_file)) return status -- cgit 1.2.3-korg