Merge "Give a way to save why a service has been disabled"

diff --cc cinder/tests/api/contrib/test_services.py
index 9b10d1b378648a06a860f906cda1218b50a5e601,fbabf65a0523be6253f03c71ed74699336688c02..ce9a38a0fd195b8e23ef57a3205bb9b51398f671
--- 1/cinder/tests/api/contrib/test_services.py
--- 2/cinder/tests/api/contrib/test_services.py
+++ b/cinder/tests/api/contrib/test_services.py
@@@ -138,8 -145,13 +145,10 @@@ class ServicesTest(test.TestCase)
          self.stubs.Set(policy, "enforce", fake_policy_enforce)
  
          self.context = context.get_admin_context()
-         self.controller = services.ServiceController()
+         self.ext_mgr = extensions.ExtensionManager()
+         self.ext_mgr.extensions = {}
+         self.controller = services.ServiceController(self.ext_mgr)
  
 -    def tearDown(self):
 -        super(ServicesTest, self).tearDown()
 -
      def test_services_list(self):
          req = FakeRequest()
          res_dict = self.controller.index(req)

diff --cc cinder/tests/test_utils.py
Simple merge