Merge branch 'master' into dryd_2_node_commission

drydock_provisioner/config.py

@@ -27,8 +27,6 @@ class DrydockConfig(object):
 
     node_driver = {
         'maasdriver':   {
-            'api_key':  'UTBfxGL69XWjaffQek:NuKZSYGuBs6ZpYC6B9:byvXBgY8CsW5VQKxGdQjvJXtjXwr5G4U',
-            'api_url':  'http://10.23.19.16:30773/MAAS/api/2.0/',
         },
     }
 

drydock_provisioner/control/base.py

@@ -117,7 +117,7 @@ class DrydockRequestContext(object):
         self.log_level = 'ERROR'
         self.user = None
         self.roles = ['anyone']
-        self.req_id = str(uuid.uuid4())
+        self.request_id = str(uuid.uuid4())
         self.external_marker = None
 
     def set_log_level(self, level):

drydock_provisioner/control/middleware.py

@@ -73,7 +73,6 @@ class ContextMiddleware(object):
             ctx.set_log_level('INFO')
 
         ext_marker = req.get_header('X-Context-Marker')
-
         ctx.set_external_marker(ext_marker if ext_marker is not None else '')
 
 class LoggingMiddleware(object):

drydock_provisioner/drivers/node/maasdriver/driver.py

@@ -111,6 +111,7 @@ class MaasNodeDriver(NodeDriver):
         site_design = self.orchestrator.get_effective_site(design_id)
 
         if task.action == hd_fields.OrchestratorAction.CreateNetworkTemplate:
+
             self.orchestrator.task_field_update(task.get_id(), status=hd_fields.TaskStatus.Running)
 
             subtask = self.orchestrator.create_task(task_model.DriverTask,
@@ -127,6 +128,7 @@ class MaasNodeDriver(NodeDriver):
 
             # TODO Figure out coherent system for putting all the timeouts in
             # the config
+
             runner.join(timeout=120)
 
             if runner.is_alive():
@@ -134,13 +136,16 @@ class MaasNodeDriver(NodeDriver):
                     'retry': False,
                     'detail': 'MaaS Network creation timed-out'
                 }
+
                 self.logger.warning("Thread for task %s timed out after 120s" % (subtask.get_id()))
+
                 self.orchestrator.task_field_update(task.get_id(),
                             status=hd_fields.TaskStatus.Complete,
                             result=hd_fields.ActionResult.Failure,
                             result_detail=result)
             else:
                 subtask = self.state_manager.get_task(subtask.get_id())
+
                 self.logger.info("Thread for task %s completed - result %s" % (subtask.get_id(), subtask.get_result()))
                 self.orchestrator.task_field_update(task.get_id(),
                             status=hd_fields.TaskStatus.Complete,

drydock_provisioner/drivers/node/maasdriver/models/base.py

@@ -145,7 +145,6 @@ class ResourceBase(object):
         return i
 
 
-
 class ResourceCollectionBase(object):
     """
     A collection of MaaS resources.

drydock_provisioner/drivers/node/maasdriver/models/machine.py

@@ -151,7 +151,6 @@ class Machines(model_base.ResourceCollectionBase):
                 self.logger.debug("Updated MaaS resource %s hostname to %s" % (maas_node.resource_id, node_model.name))
 
             return maas_node
-                
         except ValueError as ve:
             self.logger.warn("Error locating matching MaaS resource for OOB IP %s" % (node_oob_ip))
             return None

drydock_provisioner/drivers/oob/pyghmi_driver/__init__.py

@@ -171,7 +171,6 @@ class PyghmiTaskRunner(drivers.DriverTaskRunner):
             raise errors.DriverError("Runner node does not match " \
                                      "task node scope")
 
-
         ipmi_network = self.node.oob_network
         ipmi_address = self.node.get_network_address(ipmi_network)
 

drydock_provisioner/ingester/plugins/yaml.py

@@ -69,9 +69,7 @@ class YamlIngester(IngesterPlugin):
     """
     def parse_docs(self, yaml_string):
         models = []
-
         self.logger.debug("yamlingester:parse_docs - Parsing YAML string \n%s" % (yaml_string))
-
         try:
             parsed_data = yaml.load_all(yaml_string)
         except yaml.YAMLError as err:

drydock_provisioner/orchestrator/__init__.py

@@ -352,7 +352,6 @@ class Orchestrator(object):
             else:
                 final_result = hd_fields.ActionResult.Failure
 
-
             self.task_field_update(task_id,
                                 status=hd_fields.TaskStatus.Complete,
                                 result=final_result)