Merge "Fix ssl cert upload path"

[fuel.git] / deploy / cloud / deploy.py

diff --git a/deploy/cloud/deploy.py b/deploy/cloud/deploy.py
index 14d6a96..dac2fe8 100644 (file)
--- a/deploy/cloud/deploy.py
+++ b/deploy/cloud/deploy.py
@@ -8,9 +8,6 @@
 ###############################################################################
 
 
-import yaml
-import io
-
 from dea import DeploymentEnvironmentAdapter
 from configure_environment import ConfigureEnvironment
 from deployment import Deployment
@@ -22,6 +19,7 @@ from common import (
     check_file_exists,
     commafy,
     ArgParser,
+    log,
 )
 
 YAML_CONF_DIR = '/var/lib/opnfv'
@@ -29,9 +27,12 @@ YAML_CONF_DIR = '/var/lib/opnfv'
 
 class Deploy(object):
 
-    def __init__(self, dea_file, no_health_check):
+    def __init__(self, dea_file, no_health_check, deploy_timeout,
+                 no_deploy_environment):
         self.dea = DeploymentEnvironmentAdapter(dea_file)
         self.no_health_check = no_health_check
+        self.deploy_timeout = deploy_timeout
+        self.no_deploy_environment = no_deploy_environment
         self.macs_per_blade = {}
         self.blades = self.dea.get_node_ids()
         self.blade_node_dict = self.dea.get_blade_node_map()
@@ -42,8 +43,9 @@ class Deploy(object):
     def assign_roles_to_cluster_node_ids(self):
         self.node_roles_dict = {}
         for blade, node in self.blade_node_dict.iteritems():
-            roles = commafy(self.dea.get_node_role(blade))
-            self.node_roles_dict[node] = (roles, blade)
+            if self.dea.get_node_roles(blade):
+                roles = commafy(self.dea.get_node_roles(blade))
+                self.node_roles_dict[node] = (roles, blade)
 
     def configure_environment(self):
         release_list = parse(exec_cmd('fuel release -l'))
@@ -58,8 +60,12 @@ class Deploy(object):
 
     def deploy_cloud(self):
         dep = Deployment(self.dea, YAML_CONF_DIR, self.env_id,
-                         self.node_roles_dict, self.no_health_check)
-        dep.deploy()
+                         self.node_roles_dict, self.no_health_check,
+                         self.deploy_timeout)
+        if not self.no_deploy_environment:
+            dep.deploy()
+        else:
+            log('Configuration is done. Deployment is not launched.')
 
     def deploy(self):
 
@@ -75,13 +81,22 @@ def parse_arguments():
     parser.add_argument('-nh', dest='no_health_check', action='store_true',
                         default=False,
                         help='Don\'t run health check after deployment')
+    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'))
     parser.add_argument('dea_file', action='store',
                         help='Deployment Environment Adapter: dea.yaml')
+
     args = parser.parse_args()
     check_file_exists(args.dea_file)
 
     kwargs = {'dea_file': args.dea_file,
-              'no_health_check': args.no_health_check}
+              'no_health_check': args.no_health_check,
+              'deploy_timeout': args.deploy_timeout,
+              'no_deploy_environment': args.no_deploy_environment}
     return kwargs