From 7feb462ea3ad5c4be9f86758a4c3a9e10911f664 Mon Sep 17 00:00:00 2001 From: zhangyanxian Date: Tue, 20 Sep 2016 06:16:15 +0000 Subject: [PATCH] Fix typos in amphora_flows.py & octavia.conf trivial fix Change-Id: I8417740f03e4003714a5bbd9cde7ba520c5e36c1 --- etc/octavia.conf | 2 +- octavia/controller/worker/flows/amphora_flows.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/octavia.conf b/etc/octavia.conf index 47324425a5..7315a8c7a2 100644 --- a/etc/octavia.conf +++ b/etc/octavia.conf @@ -148,7 +148,7 @@ # - - amp_boot_network_list = 22222222-3333-4444-5555-666666666666 # - Multiple networks # - - amp_boot_network_list = 11111111-2222-33333-4444-555555555555, 22222222-3333-4444-5555-666666666666 -# - All networks defined in the list will be attached to each ampohra +# - All networks defined in the list will be attached to each amphora # amp_boot_network_list = # Takes a single network id that is attached to amphorae on boot diff --git a/octavia/controller/worker/flows/amphora_flows.py b/octavia/controller/worker/flows/amphora_flows.py index 7a7cf0d03d..9c7e1bb18f 100644 --- a/octavia/controller/worker/flows/amphora_flows.py +++ b/octavia/controller/worker/flows/amphora_flows.py @@ -207,7 +207,7 @@ class AmphoraFlows(object): def _create_new_amp_for_lb_decider(self, history): """decides if a new amphora must be created for the lb - :return: True + :return: True if there is no spare amphora """ return list(history.values())[0] is None @@ -230,7 +230,7 @@ class AmphoraFlows(object): requires=constants.LOADBALANCER_ID, provides=constants.AMPHORA_ID) - # Define a subflow for if we successfuly map an amphora + # Define a subflow for if we successfully map an amphora map_lb_to_amp = self._get_post_map_lb_subflow(prefix, role) # Define a subflow for if we can't map an amphora create_amp = self._get_create_amp_for_lb_subflow(prefix, role)