diff options
author | Nikolas Hermanns <nikolas.hermanns@ericsson.com> | 2016-03-07 13:31:16 +0100 |
---|---|---|
committer | Nikolas Hermanns <nikolas.hermanns@ericsson.com> | 2016-03-11 13:14:01 +0100 |
commit | 26705adaa343fdbef2440a35b438808ac34fded4 (patch) | |
tree | e961858cd8bcdcc11071052420b6d739090be234 /deploy/deploy.py | |
parent | bc4bf0ec3621dac7aa96935e48fadff0c8f03464 (diff) |
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
Diffstat (limited to 'deploy/deploy.py')
-rwxr-xr-x | deploy/deploy.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/deploy/deploy.py b/deploy/deploy.py index 492c7596a..f86f2be12 100755 --- a/deploy/deploy.py +++ b/deploy/deploy.py @@ -61,7 +61,7 @@ class AutoDeploy(object): def __init__(self, no_fuel, fuel_only, no_health_check, cleanup_only, cleanup, storage_dir, pxe_bridge, iso_file, dea_file, dha_file, fuel_plugins_dir, fuel_plugins_conf_dir, - no_plugins, deploy_timeout): + no_plugins, deploy_timeout, no_deploy_environment): self.no_fuel = no_fuel self.fuel_only = fuel_only self.no_health_check = no_health_check @@ -76,6 +76,7 @@ class AutoDeploy(object): self.fuel_plugins_conf_dir = fuel_plugins_conf_dir self.no_plugins = no_plugins self.deploy_timeout = deploy_timeout + self.no_deploy_environment = no_deploy_environment self.dea = (DeploymentEnvironmentAdapter(dea_file) if not cleanup_only else None) self.dha = DeploymentHardwareAdapter(dha_file) @@ -198,7 +199,8 @@ class AutoDeploy(object): 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) + WORK_DIR, self.no_health_check, self.deploy_timeout, + self.no_deploy_environment) return dep.deploy() def setup_execution_environment(self): @@ -239,6 +241,7 @@ class AutoDeploy(object): # Exit status return 0 + def check_bridge(pxe_bridge, dha_path): with io.open(dha_path) as yaml_file: dha_struct = yaml.load(yaml_file) @@ -319,6 +322,9 @@ def parse_arguments(): parser.add_argument('-dt', dest='deploy_timeout', action='store', default=240, help='Deployment timeout (in minutes) ' '[default: 240]') + parser.add_argument('-nde', dest='no_deploy_environment', + action='store_true', default=False, + help=('Do not launch environment deployment')) args = parser.parse_args() log(args) @@ -345,7 +351,8 @@ def parse_arguments(): 'fuel_plugins_dir': args.fuel_plugins_dir, 'fuel_plugins_conf_dir': args.fuel_plugins_conf_dir, 'no_plugins': args.no_plugins, - 'deploy_timeout': args.deploy_timeout} + 'deploy_timeout': args.deploy_timeout, + 'no_deploy_environment': args.no_deploy_environment} return kwargs |