Merge "Fix wrong parameter while creating bay"

magnum/conductor/handlers/bay_conductor.py

@@ -134,7 +134,7 @@ class Handler(object):
                                           bay_create_timeout)
         except Exception as e:
             cert_manager.delete_certificates_from_bay(bay)
-            trust_manager.delete_trustee_and_trust(osc, bay)
+            trust_manager.delete_trustee_and_trust(osc, context, bay)
 
             if isinstance(e, exc.HTTPBadRequest):
                 e = exception.InvalidParameterValue(message=six.text_type(e))

magnum/tests/unit/conductor/handlers/test_bay_conductor.py

@@ -222,7 +222,7 @@ class TestHandler(db_base.DbTestCase):
 
         mock_cert_manager.delete_certificates_from_bay(self.bay)
         mock_trust_manager.delete_trustee_and_trust.assert_called_once_with(
-            osc, self.bay)
+            osc, self.context, self.bay)
 
     @patch('magnum.conductor.handlers.bay_conductor.trust_manager')
     @patch('magnum.conductor.handlers.bay_conductor.cert_manager')