openstack
/
neutron
Code Issues Proposed changes

Merge "[Fullstack] Configure policy.json file only if it is set"

This commit is contained in:
Zuul 2018-11-30 21:57:42 +00:00 committed by Gerrit Code Review
parent 934a54a2ed 481211dc3a
commit f9a80d30ef
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
neutron/tests/fullstack/resources/config.py
View File

@ -82,13 +82,14 @@ class NeutronConfigFixture(ConfigFixture):
'oslo_concurrency': {
'lock_path': '$state_path/lock',
},
'oslo_policy': {
'policy_file': self._generate_policy_json(),
},
'agent': {
'report_interval': str(env_desc.agent_down_time / 2.0)
},
})
policy_file = self._generate_policy_json()
if policy_file:
self.config['oslo_policy'] = {'policy_file': policy_file}
# Set root_helper/root_helper_daemon only when env var is set
root_helper = os.environ.get('OS_ROOTWRAP_CMD')
if root_helper: