openstack
/
freezer-dr
Code Issues Proposed changes

Merge "Fix update nodes in fencers"

This commit is contained in:
Jenkins 2017-07-20 14:59:28 +00:00 committed by Gerrit Code Review
parent 6b502637c5 b1116e787b
commit 4962bae5a7
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
freezer_dr/evacuators/drivers/default/standard.py
View File

@ -64,8 +64,7 @@ class StandardEvacuator(EvacuatorBaseDriver):
nodes = succeeded_nodes nodes = succeeded_nodes
if enable_fencing: if enable_fencing:
self.fencer.update_nodes(nodes) nodes = self.fencer.fence(nodes=nodes)
nodes = self.fencer.fence()
""" """
@todo this code needs to be commented for the time being till we fix @todo this code needs to be commented for the time being till we fix
nova bug found in state, which always go up afer enable or disable. We nova bug found in state, which always go up afer enable or disable. We

4
freezer_dr/fencers/common/driver.py
View File

@ -41,10 +41,6 @@ class FencerBaseDriver(object):
self.nodes = nodes self.nodes = nodes
self.fencer_conf = fencer_conf self.fencer_conf = fencer_conf
def update_nodes(self, nodes):
"""Allows changing the nodes during the evacuation..."""
self.nodes = nodes
@abc.abstractmethod @abc.abstractmethod
def fence(self): def fence(self):
"""This function to be implemented by each driver. Each driver will """This function to be implemented by each driver. Each driver will

6
freezer_dr/fencers/common/manager.py
View File

@ -26,14 +26,18 @@ class FencerManager(object):
self.fencer_conf = CONF.get('fencer') self.fencer_conf = CONF.get('fencer')
self.nodes = nodes self.nodes = nodes
def fence(self): def fence(self, nodes=None):
""" """
Try to shutdown nodes and wait for configurable amount of times Try to shutdown nodes and wait for configurable amount of times
:return: list of nodes and either they are shutdown or failed :return: list of nodes and either they are shutdown or failed
""" """
# update the list of nodes if required!
if nodes:
self.nodes = nodes
driver_name = self.fencer_conf['driver'] driver_name = self.fencer_conf['driver']
driver = importutils.import_object( driver = importutils.import_object(
driver_name, driver_name,
self.nodes,
self.fencer_conf self.fencer_conf
) )
LOG.debug('Loaded fencing driver {0} with config: ' LOG.debug('Loaded fencing driver {0} with config: '