From 721c7a574c6c028de991de41cfb85e0a81b4f681 Mon Sep 17 00:00:00 2001
From: Hemanth Nakkina <hemanth.nakkina@canonical.com>
Date: Tue, 13 Jul 2021 16:12:28 +0530
Subject: [PATCH] Move anti-affinity-policy config option to nova section

enable_anti_affinity, anti_affinity_policy options are configured
in controller_worker section instead of nova section in octavia.conf
templates.

This patch fixes by moving both the options to nova section.

Closes-Bug: #1935960
Change-Id: I4818e3282eb25c9d0f0829080d4a5791965dbee0
---
 src/templates/rocky/octavia.conf    | 22 +++++++++++-----------
 src/templates/victoria/octavia.conf | 22 +++++++++++-----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/templates/rocky/octavia.conf b/src/templates/rocky/octavia.conf
index 55bcc8a0..2fc8535d 100644
--- a/src/templates/rocky/octavia.conf
+++ b/src/templates/rocky/octavia.conf
@@ -46,17 +46,6 @@ network_driver = allowed_address_pairs_driver
 compute_driver = compute_nova_driver
 amphora_driver = amphora_haproxy_rest_driver
 loadbalancer_topology = {{ options.loadbalancer_topology }}
-{%- if options.loadbalancer_topology == "SINGLE" or options.anti_affinity_policy == "disable" %}
-enable_anti_affinity = False
-{%- elif options.loadbalancer_topology == "ACTIVE_STANDBY" %}
-{%- if options.anti_affinity_policy == "auto" %}
-enable_anti_affinity = True
-anti_affinity_policy = "soft-anti-affinity"
-{%- elif options.anti_affinity_policy in ["anti-affinity", "soft-anti-affinity"] %}
-enable_anti_affinity = True
-anti_affinity_policy = {{ options.anti_affinity_policy }}
-{%- endif %}
-{%- endif %}
 
 [certificates]
 # NOTE(fnordahl) certificates for authentication between Octavia controllers
@@ -113,6 +102,17 @@ region_name = {{ options.region }}
 {% if options.use_internal_endpoints -%}
 endpoint_type = internalURL
 {%- endif %}
+{%- if options.loadbalancer_topology == "SINGLE" or options.anti_affinity_policy == "disable" %}
+enable_anti_affinity = False
+{%- elif options.loadbalancer_topology == "ACTIVE_STANDBY" %}
+{%- if options.anti_affinity_policy == "auto" %}
+enable_anti_affinity = True
+anti_affinity_policy = "soft-anti-affinity"
+{%- elif options.anti_affinity_policy in ["anti-affinity", "soft-anti-affinity"] %}
+enable_anti_affinity = True
+anti_affinity_policy = {{ options.anti_affinity_policy }}
+{%- endif %}
+{%- endif %}
 
 [cinder]
 {% if options.region -%}
diff --git a/src/templates/victoria/octavia.conf b/src/templates/victoria/octavia.conf
index 6f22ead9..a356e313 100644
--- a/src/templates/victoria/octavia.conf
+++ b/src/templates/victoria/octavia.conf
@@ -65,17 +65,6 @@ network_driver = allowed_address_pairs_driver
 compute_driver = compute_nova_driver
 amphora_driver = amphora_haproxy_rest_driver
 loadbalancer_topology = {{ options.loadbalancer_topology }}
-{%- if options.loadbalancer_topology == "SINGLE" or options.anti_affinity_policy == "disable" %}
-enable_anti_affinity = False
-{%- elif options.loadbalancer_topology == "ACTIVE_STANDBY" %}
-{%- if options.anti_affinity_policy == "auto" %}
-enable_anti_affinity = True
-anti_affinity_policy = "soft-anti-affinity"
-{%- elif options.anti_affinity_policy in ["anti-affinity", "soft-anti-affinity"] %}
-enable_anti_affinity = True
-anti_affinity_policy = {{ options.anti_affinity_policy }}
-{%- endif %}
-{%- endif %}
 
 [certificates]
 # NOTE(fnordahl) certificates for authentication between Octavia controllers
@@ -132,6 +121,17 @@ region_name = {{ options.region }}
 {% if options.use_internal_endpoints -%}
 endpoint_type = internalURL
 {%- endif %}
+{%- if options.loadbalancer_topology == "SINGLE" or options.anti_affinity_policy == "disable" %}
+enable_anti_affinity = False
+{%- elif options.loadbalancer_topology == "ACTIVE_STANDBY" %}
+{%- if options.anti_affinity_policy == "auto" %}
+enable_anti_affinity = True
+anti_affinity_policy = "soft-anti-affinity"
+{%- elif options.anti_affinity_policy in ["anti-affinity", "soft-anti-affinity"] %}
+enable_anti_affinity = True
+anti_affinity_policy = {{ options.anti_affinity_policy }}
+{%- endif %}
+{%- endif %}
 
 [cinder]
 {% if options.region -%}