From f2b2b9cf5e97b524bf7ea215d2309089bd4a9138 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= <radoslaw.piliszek@gmail.com>
Date: Sun, 8 Nov 2020 09:37:35 +0100
Subject: [PATCH] Remove a CentOS IPv6 FIXME meant for Ussuri

CentOS 8 should work fine without the workaround.

This change adds the missing CentOS 8 IPv6 CI job as well.

Change-Id: I58af7a09b5ae09a10b9efc33c1f30c2efc6613f7
---
 ansible/roles/mariadb/templates/galera.cnf.j2 | 14 +-------------
 zuul.d/jobs.yaml                              |  8 ++++++++
 zuul.d/project.yaml                           |  1 +
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/ansible/roles/mariadb/templates/galera.cnf.j2 b/ansible/roles/mariadb/templates/galera.cnf.j2
index 4e59073feb..96236f5594 100644
--- a/ansible/roles/mariadb/templates/galera.cnf.j2
+++ b/ansible/roles/mariadb/templates/galera.cnf.j2
@@ -28,23 +28,11 @@ datadir=/var/lib/mysql/
 
 wsrep_cluster_address=gcomm://{% if (groups['mariadb'] | length) > 1 %}{% for host in groups['mariadb'] %}{{ 'api' | kolla_address(host) | put_address_in_context('url') }}:{{ mariadb_wsrep_port }}{% if not loop.last %},{% endif %}{% endfor %}{% endif %}
 
-{% if api_address_family == 'ipv6' and kolla_base_distro == 'centos' %}
-# FIXME(jeffrey4l): Revert when using C8 (CentOS+Ussuri)
-# Use [::] to avoid galera issue.
-# for more info see https://github.com/codership/galera/issues/534#issuecomment-472607544
-wsrep_provider_options=gmcast.listen_addr=tcp://[::]:{{ mariadb_wsrep_port }};ist.recv_addr={{ api_interface_address | put_address_in_context('url') }}:{{ mariadb_ist_port }};{% for option in mariadb_wsrep_extra_provider_options %}{{ option }}{% if not loop.last %};{% endif %}{% endfor %}
-{% else %}
 wsrep_provider_options=gmcast.listen_addr=tcp://{{ api_interface_address | put_address_in_context('url') }}:{{ mariadb_wsrep_port }};ist.recv_addr={{ api_interface_address | put_address_in_context('url') }}:{{ mariadb_ist_port }};{% for option in mariadb_wsrep_extra_provider_options %}{{ option }}{% if not loop.last %};{% endif %}{% endfor %}
-{% endif %}
 
 wsrep_node_address={{ api_interface_address | put_address_in_context('url') }}:{{ mariadb_wsrep_port }}
-{% if api_address_family == 'ipv6' and kolla_base_distro == 'centos' %}
-# FIXME(yj.bai): Revert when using C8 (CentOS+Ussuri)
-# Use IPv6-resolvable hostname to avoid galera issue.
-wsrep_sst_receive_address={{ ansible_hostname }}:{{ mariadb_sst_port }}
-{% else %}
+
 wsrep_sst_receive_address={{ api_interface_address | put_address_in_context('url') }}:{{ mariadb_sst_port }}
-{% endif %}
 
 wsrep_provider={{ wsrep_driver }}
 wsrep_cluster_name="{{ database_cluster_name }}"
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index edcea29696..e5ea4f6430 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -52,6 +52,14 @@
       base_distro: ubuntu
       install_type: source
 
+- job:
+    name: kolla-ansible-centos8-source-multinode-ipv6
+    parent: kolla-ansible-ipv6-base
+    nodeset: kolla-ansible-centos8-multi
+    vars:
+      base_distro: centos
+      install_type: source
+
 - job:
     name: kolla-ansible-ubuntu-source-multinode-ipv6
     parent: kolla-ansible-ipv6-base
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 61d1d42d8f..d181292e0d 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -16,6 +16,7 @@
         - kolla-ansible-ubuntu-source
         - kolla-ansible-centos8-source-kvm
         - kolla-ansible-ubuntu-source-kvm
+        - kolla-ansible-centos8-source-multinode-ipv6
         - kolla-ansible-ubuntu-source-multinode-ipv6
         - kolla-ansible-centos8-source-bifrost
         - kolla-ansible-centos8-source-zun