openstack
/
deb-cinder
Code Issues Proposed changes

Merge "Failback will enable the host that has been frozen"

This commit is contained in:
Jenkins 2016-05-16 10:10:03 +00:00 committed by Gerrit Code Review
parent ecd5bd44d1 1f0f01a7c1
commit 5bd5f22053
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cinder/volume/manager.py
View File

@ -3293,8 +3293,12 @@ class VolumeManager(manager.SchedulerDependentManager):
if secondary_backend_id == "default":
service.replication_status = fields.ReplicationStatus.ENABLED
service.active_backend_id = ""
service.disabled = False
service.disabled_reason = ""
if service.frozen:
service.disabled = True
service.disabled_reason = "frozen"
else:
service.disabled = False
service.disabled_reason = ""
service.save()
else: