Add LB starting logic in LB restoring logic and fix DecortController.lb_state method VALID_TARGET_STATES list

rc-5.3.0^2
Dmitriy Smirnov 11 months ago
parent 3bdac96760
commit 4311eee435

@ -135,8 +135,7 @@ class decort_lb(DecortController):
self.lb_restore(lb_id=self.lb_id) self.lb_restore(lb_id=self.lb_id)
_, self.lb_facts = self._lb_get_by_id(lb_id=self.lb_id) _, self.lb_facts = self._lb_get_by_id(lb_id=self.lb_id)
self.lb_state(self.lb_facts, 'enabled') self.lb_state(self.lb_facts, 'enabled')
self.lb_facts['status'] = "ENABLED" _, self.lb_facts = self._lb_get_by_id(lb_id=self.lb_id)
self.lb_facts['techStatus'] = "STARTED"
self.lb_update( self.lb_update(
self.lb_facts['primaryNode'], self.lb_facts['primaryNode'],
@ -322,7 +321,7 @@ def main():
decon.action(amodule.params['state']) decon.action(amodule.params['state'])
elif decon.lb_facts['status'] == "DELETED": elif decon.lb_facts['status'] == "DELETED":
if amodule.params['state'] in ['present', 'enabled']: if amodule.params['state'] in ['present', 'enabled']:
decon.action(restore=True) decon.action(d_state='started', restore=True)
elif (amodule.params['state'] == 'absent' and elif (amodule.params['state'] == 'absent' and
amodule.params['permanently']): amodule.params['permanently']):
decon.delete() decon.delete()

@ -4177,7 +4177,7 @@ class DecortController(object):
NOP_STATES_FOR_LB_CHANGE = ["MODELED", "DISABLING", "ENABLING", "DELETING", "DELETED", "DESTROYING", NOP_STATES_FOR_LB_CHANGE = ["MODELED", "DISABLING", "ENABLING", "DELETING", "DELETED", "DESTROYING",
"DESTROYED"] "DESTROYED"]
VALID_TARGET_STATES = ["enabled", "disabled","restart"] VALID_TARGET_STATES = ["enabled", "disabled","restart", 'started']
VALID_TARGET_TSTATES = ["STARTED","STOPPED"] VALID_TARGET_TSTATES = ["STARTED","STOPPED"]
if lb_dict['status'] in NOP_STATES_FOR_LB_CHANGE: if lb_dict['status'] in NOP_STATES_FOR_LB_CHANGE:

Loading…
Cancel
Save