diff options
| author | Zuul <zuul@review.openstack.org> | 2018-10-05 15:01:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-10-05 15:01:07 +0000 |
| commit | 41f6560dd6d4b6cae92c1ceea2038720666621f9 (patch) | |
| tree | 9b9d23e1742cd0806e8760cf6a51fa6ef6c3fdb3 | |
| parent | 688914a24744bb0bfabf43d970df507a10dc91e3 (diff) | |
| parent | d82a5d3c1471524969aafe4a441465ac0ce11f7c (diff) | |
| download | neutron-41f6560dd6d4b6cae92c1ceea2038720666621f9.tar.gz | |
Merge "Update tests neutron.conf to use transport_url"
| -rw-r--r-- | neutron/tests/base.py | 1 | ||||
| -rw-r--r-- | neutron/tests/etc/neutron.conf | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/neutron/tests/base.py b/neutron/tests/base.py index f166bbba3d..2f560ccbb3 100644 --- a/neutron/tests/base.py +++ b/neutron/tests/base.py @@ -291,7 +291,6 @@ class BaseTestCase(DietTestCase): @staticmethod def config_parse(conf=None, args=None): """Create the default configurations.""" - # neutron.conf includes rpc_backend which needs to be cleaned up if args is None: args = [] args += ['--config-file', etcdir('neutron.conf')] diff --git a/neutron/tests/etc/neutron.conf b/neutron/tests/etc/neutron.conf index 798ff3e9f3..74d8bfe418 100644 --- a/neutron/tests/etc/neutron.conf +++ b/neutron/tests/etc/neutron.conf @@ -14,8 +14,8 @@ bind_port = 9696 # Paste configuration file api_paste_config = api-paste.ini.test -# The messaging module to use, defaults to kombu. -rpc_backend = fake +# The messaging transport URL +transport_url = 'fake:/' lock_path = $state_path/lock |