From 951afb9a0a94413f8d452fa5516cf4dc412968a7 Mon Sep 17 00:00:00 2001
From: Gregory Thiemonge <gthiemon@redhat.com>
Date: Tue, 2 Apr 2019 14:24:53 +0200
Subject: [PATCH] Fix IPv6 in Active/Standby topology on CentOS

Avoid duplicated IPv6 VIP addresses on CentOS in Active/Standby mode,
Keepalived will set/unset the VIP address.

Story: 2005365
Task: 30340

Change-Id: I05b31ba628bafeefec36cc5c000dae1aefb63d67
---
 .../agent/api_server/templates/rh_plug_vip_ethX.conf.j2       | 2 ++
 .../notes/fix-active-standby-in-centos-4e47140e0e139de8.yaml  | 4 ++++
 2 files changed, 6 insertions(+)
 create mode 100644 releasenotes/notes/fix-active-standby-in-centos-4e47140e0e139de8.yaml

diff --git a/octavia/amphorae/backends/agent/api_server/templates/rh_plug_vip_ethX.conf.j2 b/octavia/amphorae/backends/agent/api_server/templates/rh_plug_vip_ethX.conf.j2
index 0bef366dce..c2a66343c0 100644
--- a/octavia/amphorae/backends/agent/api_server/templates/rh_plug_vip_ethX.conf.j2
+++ b/octavia/amphorae/backends/agent/api_server/templates/rh_plug_vip_ethX.conf.j2
@@ -52,7 +52,9 @@ PERSISTENT_DHCLIENT="1"
 {%- endif %} {# end if vip_ipv6 #}
 {%- endif %} {# end if vrrp_ip #}
 
+{%- if topology == consts.TOPOLOGY_SINGLE -%}
 {%- if vip_ipv6 %}
 IPV6ADDR_SECONDARIES="{{ vip }}/{{ prefix }}"
 {%- endif %}
+{%- endif %}
 
diff --git a/releasenotes/notes/fix-active-standby-in-centos-4e47140e0e139de8.yaml b/releasenotes/notes/fix-active-standby-in-centos-4e47140e0e139de8.yaml
new file mode 100644
index 0000000000..1da390c904
--- /dev/null
+++ b/releasenotes/notes/fix-active-standby-in-centos-4e47140e0e139de8.yaml
@@ -0,0 +1,4 @@
+---
+fixes:
+  - |
+    Fixed duplicated IPv6 addresses in Active/Standby mode in CentOS amphorae.