openstack
/
cinder
Code Issues Proposed changes

Merge "cinder-backup - coordination not initialized" into stable/newton

This commit is contained in:
Jenkins 2017-03-29 04:18:12 +00:00 committed by Gerrit Code Review
parent 56786a3c88 161cffca64
commit 98a11913ea
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cinder/cmd/backup.py
View File

@ -54,6 +54,7 @@ def main():
priv_context.init(root_helper=shlex.split(utils.get_root_helper()))
utils.monkey_patch()
gmr.TextGuruMeditation.setup_autorun(version, conf=CONF)
server = service.Service.create(binary='cinder-backup')
server = service.Service.create(binary='cinder-backup',
coordination=True)
service.serve(server)
service.wait()

3
cinder/tests/unit/test_cmd.py
View File

@ -107,7 +107,8 @@ class TestCinderBackupCmd(test.TestCase):
self.assertEqual(CONF.version, version.version_string())
log_setup.assert_called_once_with(CONF, "cinder")
monkey_patch.assert_called_once_with()
service_create.assert_called_once_with(binary='cinder-backup')
service_create.assert_called_once_with(binary='cinder-backup',
coordination=True)
service_serve.assert_called_once_with(server)
service_wait.assert_called_once_with()