summaryrefslogtreecommitdiffstats
path: root/deploy/deploy.py
diff options
context:
space:
mode:
Diffstat (limited to 'deploy/deploy.py')
-rwxr-xr-xdeploy/deploy.py19
1 files changed, 14 insertions, 5 deletions
diff --git a/deploy/deploy.py b/deploy/deploy.py
index bc1dfdb49..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):
@@ -224,7 +226,8 @@ class AutoDeploy(object):
self.install_fuel_master()
if not self.fuel_only:
return self.deploy_env()
- return True
+ # Exit status
+ return 0
def run(self):
check_if_root()
@@ -235,7 +238,9 @@ class AutoDeploy(object):
if self.cleanup:
self.cleanup_execution_environment()
return deploy_success
- return True
+ # Exit status
+ return 0
+
def check_bridge(pxe_bridge, dha_path):
with io.open(dha_path) as yaml_file:
@@ -317,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)
@@ -343,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