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

Path for policy.json file in config of fullstack's neutron-server
is generated automatically. It may happen that this path will have
value ``None`` and in such case it shouldn't be placed in
neutron's config file.

Change-Id: I2416545e7d939f920a1b04bb29bcc1aff86bedd9
This commit is contained in:
Slawek Kaplonski 2018-11-27 12:35:50 +01:00
parent 94703e1e42
commit 481211dc3a
1 changed files with 4 additions and 3 deletions

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: