From c4c7387f8904075b961612b5a08aff47c51c081c Mon Sep 17 00:00:00 2001 From: Sven Wegener Date: Wed, 16 Jan 2019 13:44:34 +0100 Subject: [PATCH] worker: Re-add FailoverPreparationForAmphora This tasks removes the dns_name option from ports, so that they can be plugged into a new amphora, which has a different name. This was lost in change I04d267bd3cdedca11f0350c5255086233cba14ec. Story: 2006205 Task: 35791 Change-Id: I4230feae5b6f0778b738bddbc69c5a0cd3e6930c Signed-off-by: Sven Wegener --- octavia/controller/worker/v1/flows/amphora_flows.py | 4 ++++ octavia/controller/worker/v2/flows/amphora_flows.py | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/octavia/controller/worker/v1/flows/amphora_flows.py b/octavia/controller/worker/v1/flows/amphora_flows.py index 22514ddeae..be041a8071 100644 --- a/octavia/controller/worker/v1/flows/amphora_flows.py +++ b/octavia/controller/worker/v1/flows/amphora_flows.py @@ -364,6 +364,10 @@ class AmphoraFlows(object): rebind={constants.AMPHORA: constants.FAILED_AMPHORA}, requires=constants.AMPHORA)) + failover_amphora_flow.add(network_tasks.FailoverPreparationForAmphora( + rebind={constants.AMPHORA: constants.FAILED_AMPHORA}, + requires=constants.AMPHORA)) + # Note: It seems intuitive to boot an amphora prior to deleting # the old amphora, however this is a complicated issue. # If the target host (due to anit-affinity) is resource diff --git a/octavia/controller/worker/v2/flows/amphora_flows.py b/octavia/controller/worker/v2/flows/amphora_flows.py index 09deab886e..5693125f75 100644 --- a/octavia/controller/worker/v2/flows/amphora_flows.py +++ b/octavia/controller/worker/v2/flows/amphora_flows.py @@ -364,6 +364,10 @@ class AmphoraFlows(object): rebind={constants.AMPHORA: constants.FAILED_AMPHORA}, requires=constants.AMPHORA)) + failover_amphora_flow.add(network_tasks.FailoverPreparationForAmphora( + rebind={constants.AMPHORA: constants.FAILED_AMPHORA}, + requires=constants.AMPHORA)) + # Note: It seems intuitive to boot an amphora prior to deleting # the old amphora, however this is a complicated issue. # If the target host (due to anit-affinity) is resource