Skip to content

Commit 09943dc

Browse files
committed
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 (cherry picked from commit f2b2b9c)
1 parent 1c2b5e0 commit 09943dc

File tree

3 files changed

+10
-13
lines changed

3 files changed

+10
-13
lines changed

ansible/roles/mariadb/templates/galera.cnf.j2

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,11 @@ datadir=/var/lib/mysql/
2828

2929
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 %}
3030

31-
{% if api_address_family == 'ipv6' and kolla_base_distro == 'centos' %}
32-
# FIXME(jeffrey4l): Revert when using C8 (CentOS+Ussuri)
33-
# Use [::] to avoid galera issue.
34-
# for more info see https://github.com/codership/galera/issues/534#issuecomment-472607544
35-
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 %}
36-
{% else %}
3731
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 %}
38-
{% endif %}
3932

4033
wsrep_node_address={{ api_interface_address | put_address_in_context('url') }}:{{ mariadb_wsrep_port }}
41-
{% if api_address_family == 'ipv6' and kolla_base_distro == 'centos' %}
42-
# FIXME(yj.bai): Revert when using C8 (CentOS+Ussuri)
43-
# Use IPv6-resolvable hostname to avoid galera issue.
44-
wsrep_sst_receive_address={{ ansible_hostname }}:{{ mariadb_sst_port }}
45-
{% else %}
34+
4635
wsrep_sst_receive_address={{ api_interface_address | put_address_in_context('url') }}:{{ mariadb_sst_port }}
47-
{% endif %}
4836

4937
wsrep_provider={{ wsrep_driver }}
5038
wsrep_cluster_name="{{ database_cluster_name }}"

zuul.d/jobs.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,14 @@
5252
base_distro: ubuntu
5353
install_type: source
5454

55+
- job:
56+
name: kolla-ansible-centos8-source-multinode-ipv6
57+
parent: kolla-ansible-ipv6-base
58+
nodeset: kolla-ansible-centos8-multi
59+
vars:
60+
base_distro: centos
61+
install_type: source
62+
5563
- job:
5664
name: kolla-ansible-ubuntu-source-multinode-ipv6
5765
parent: kolla-ansible-ipv6-base

zuul.d/project.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
- kolla-ansible-ubuntu-source
1717
- kolla-ansible-centos8-source-kvm
1818
- kolla-ansible-ubuntu-source-kvm
19+
- kolla-ansible-centos8-source-multinode-ipv6
1920
- kolla-ansible-ubuntu-source-multinode-ipv6
2021
- kolla-ansible-centos8-source-bifrost
2122
- kolla-ansible-centos8-source-zun

0 commit comments

Comments
 (0)