diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-12 09:11:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-12 09:11:45 +0000 |
| commit | 4f9d721de3fa0851497afb92c99aa06fce2ce453 (patch) | |
| tree | 932ae83ad6e76f923eeea81bb6b46330a6d51d83 | |
| parent | c6eb8914db4551edd9a105873f79c00b4ca53d00 (diff) | |
| parent | b09dabae177d4eb1dc5ba19d0c7962c7fec9faad (diff) | |
| download | nova-4f9d721de3fa0851497afb92c99aa06fce2ce453.tar.gz nova-4f9d721de3fa0851497afb92c99aa06fce2ce453.tar.xz nova-4f9d721de3fa0851497afb92c99aa06fce2ce453.zip | |
Merge "Allow forcing local conductor."
| -rw-r--r-- | nova/conductor/__init__.py | 3 | ||||
| -rw-r--r-- | nova/tests/conductor/test_conductor.py | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/nova/conductor/__init__.py b/nova/conductor/__init__.py index 1e31da54c..4c702d037 100644 --- a/nova/conductor/__init__.py +++ b/nova/conductor/__init__.py @@ -18,7 +18,8 @@ import nova.openstack.common.importutils def API(*args, **kwargs): - if nova.openstack.common.cfg.CONF.conductor.use_local: + use_local = kwargs.pop('use_local', False) + if nova.openstack.common.cfg.CONF.conductor.use_local or use_local: api = conductor_api.LocalAPI else: api = conductor_api.API diff --git a/nova/tests/conductor/test_conductor.py b/nova/tests/conductor/test_conductor.py index 7986fc583..909174fa9 100644 --- a/nova/tests/conductor/test_conductor.py +++ b/nova/tests/conductor/test_conductor.py @@ -700,6 +700,11 @@ class ConductorImportTest(test.TestCase): self.assertTrue(isinstance(conductor.API(), conductor_api.API)) + def test_import_conductor_override_to_local(self): + self.flags(use_local=False, group='conductor') + self.assertTrue(isinstance(conductor.API(use_local=True), + conductor_api.LocalAPI)) + class ConductorPolicyTest(test.TestCase): def test_all_allowed_keys(self): |