openstack
/
fuel-web
Code Issues Proposed changes

Merge "Do not pass excessive configuration to shotgun"

This commit is contained in:
Jenkins 2016-06-23 07:54:50 +00:00 committed by Gerrit Code Review
parent 5da8db2fce e8e9157cea
commit b65685a1a7
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nailgun/nailgun/task/task.py
View File

@ -1889,6 +1889,12 @@ class DumpTask(object):
dump_conf['dump']['controller']['hosts'].append(host)
# save slaves
dump_conf['dump']['slave']['hosts'].append(host)
if 'controller' in dump_conf['dump'] and \
not dump_conf['dump']['controller']['hosts']:
del dump_conf['dump']['controller']
if 'slave' in dump_conf['dump'] and \
not dump_conf['dump']['slave']['hosts']:
del dump_conf['dump']['slave']
# render postgres connection data in dump settings
dump_conf['dump']['local']['objects'].append({

3
nailgun/nailgun/test/unit/test_snapshot_conf.py
View File

@ -28,7 +28,8 @@ class TestSnapshotConf(base.TestCase):
conf = task.DumpTask.conf()
self.assertIn('local', conf['dump'])
self.assertIn('master', conf['dump'])
self.assertIn('slave', conf['dump'])
self.assertNotIn('slave', conf['dump'])
self.assertNotIn('controller', conf['dump'])
def test_local_host(self):
conf = task.DumpTask.conf()