corosync_token_timeout is not respected

[Michele Baldessari]

We used to set corosync_token_timeout in THT to 10s. This change does not propagate any longer because in pcs 0.10 the cluster_setup_extra keys are ignored.

The historical reason for them to be ignored was that the syntax from pcs 0.9 to pcs 0.10 has been completely changed in an incompatible way.

We need to make sure that:
A) corosync_token_timeout does indeed apply the totem token change to pcs on both rhel 7 and rhel 8 B) we need to make sure that cluster_setup_extras will work again.

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: master
Review: https://review.opendev.org/739933

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: master
Review: https://review.opendev.org/739936

[Michele Baldessari (michele)]

And https://review.opendev.org/#/c/739934/

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/739933
Committed: https://git.openstack.org/cgit/openstack/puppet-tripleo/commit/?id=6cfb7d36b3d42fc8052c9392d4b747e8921106f2
Submitter: Zuul
Branch: master

commit 6cfb7d36b3d42fc8052c9392d4b747e8921106f2
Author: Michele Baldessari <email address hidden>
Date: Wed Jul 8 11:12:52 2020 +0200

    Fix up cluster_setup_extras usage

    Starting with pcs 0.10 (CentOS/RHEL 8) the arguments to pcs cluster
    setup changed completely in an incompatible way and in fact are ignored
    by puppet-pacemaker. As we would like to reenable them, we first need to
    make sure that whatever we pass is not understood by pcs.

    We can also drop ipv6 and encryption parameters as corosync/pcs do not
    need them any longer.

    Change-Id: Iaecced845b80e958c7ad0ef96896f1202259cca2
    Related-Bug: #1886789

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: stable/ussuri
Review: https://review.opendev.org/744189

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: stable/train
Review: https://review.opendev.org/744192

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/744192
Committed: https://git.openstack.org/cgit/openstack/puppet-tripleo/commit/?id=abbc4e4c409f002ac0bc2ebb594aa1684f7b3424
Submitter: Zuul
Branch: stable/train

commit abbc4e4c409f002ac0bc2ebb594aa1684f7b3424
Author: Damien Ciabrini <email address hidden>
Date: Fri Jul 31 16:48:13 2020 +0200

    Fix up cluster_setup_extras usage

    Starting with pcs 0.10 (CentOS/RHEL 8) the arguments to pcs cluster
    setup changed completely in an incompatible way and in fact are ignored
    by puppet-pacemaker. As we would like to reenable them, we first need to
    make sure that whatever we pass is not understood by pcs.

    We can also drop ipv6 and encryption parameters as corosync/pcs do not
    need them any longer.

    (manually adapted from Iaecced845b80e958c7ad0ef96896f1202259cca2 to
    support CentOS/RHEL 7 and 8)

    Change-Id: Id54537205538740a09a570a392f291a14d759f61
    Related-Bug: #1886789
    Related-Bug: #1889764
    (cherry picked from commit ef7818ecc2de85e85e08125a1304eaa17891a77c)

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/744189
Committed: https://git.openstack.org/cgit/openstack/puppet-tripleo/commit/?id=ef7818ecc2de85e85e08125a1304eaa17891a77c
Submitter: Zuul
Branch: stable/ussuri

commit ef7818ecc2de85e85e08125a1304eaa17891a77c
Author: Damien Ciabrini <email address hidden>
Date: Fri Jul 31 16:48:13 2020 +0200

    Fix up cluster_setup_extras usage

    Starting with pcs 0.10 (CentOS/RHEL 8) the arguments to pcs cluster
    setup changed completely in an incompatible way and in fact are ignored
    by puppet-pacemaker. As we would like to reenable them, we first need to
    make sure that whatever we pass is not understood by pcs.

    We can also drop ipv6 and encryption parameters as corosync/pcs do not
    need them any longer.

    (manually adapted from Iaecced845b80e958c7ad0ef96896f1202259cca2 to
    support CentOS/RHEL 7 and 8)

    Change-Id: Id54537205538740a09a570a392f291a14d759f61
    Related-Bug: #1886789
    Related-Bug: #1889764

[Marios Andreou (marios-b)]

moving this to fix-released based on the patches here that merged.

Please move back if you disagree thanks

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/739936
Committed: https://opendev.org/openstack/tripleo-heat-templates/commit/e737e3f3a5e0e23230093afe149a178966585eab
Submitter: "Zuul (22348)"
Branch: master

commit e737e3f3a5e0e23230093afe149a178966585eab
Author: Michele Baldessari <email address hidden>
Date: Wed Jul 8 11:19:25 2020 +0200

    Remove deprecated ipv6 corosync parameters

    Those are not used anymore since we moved to pcs 0.10/rhel 8 which
    uses kronosnet as the default corosync protocol.

    In fact corosync_ipv6 in puppet has been removed via
    Iaecced845b80e958c7ad0ef96896f1202259cca2 (Fix up cluster_setup_extras
    usage)

    Change-Id: Icb2bc7cde405584c29ff61609cd104b16ddc67ea
    Related-Bug: #1886789