environments/docker-ha.yaml enables Redis which is optional now

[Takashi Kajinami]

Currently environments/docker-ha.yaml defines OS::TripleO::Services::Redis resource, but it is undesirable behaviour because Redis is now optional services, and we expect it is enabled only when operators explicitly enable the resource in their environment files like environments/enable-legacy-telemetry.yaml.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.opendev.org/719747

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/719747
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=c614d19bbb83fc422690b58ff3729625b6166518
Submitter: Zuul
Branch: master

commit c614d19bbb83fc422690b58ff3729625b6166518
Author: Takashi Kajinami <email address hidden>
Date: Tue Apr 14 16:17:29 2020 +0900

    Disable Redis in environments/docker-ha.yaml

    ... because now Redis is an optional service and enabled only when
    legacy telemetry services are enabled.

    Closes-Bug: #1872645
    Change-Id: Ib627643041cab0cef7bc08f8b8a3100dd327d4d6

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/train
Review: https://review.opendev.org/721516

[OpenStack Infra (hudson-openstack)]

Change abandoned by Takashi Kajinami (<email address hidden>) on branch: stable/train
Review: https://review.opendev.org/721516

[Takashi Kajinami (kajinamit)]

Changing the status back to new, because the fix was reverted after some concerns about unmanaged resources during update was raised.

 https://github.com/openstack/tripleo-heat-templates/commit/a126db00ba2f9cf96a07b278cf96b36350cb3382

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: master
Review: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/818055

[OpenStack Infra (hudson-openstack)]

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

commit 4236449451d4053fa5944fb4c9c78ea083d4145e
Author: Damien Ciabrini <email address hidden>
Date: Tue Nov 16 08:26:51 2021 +0100

    Check that redis is removed prior to FFU

    We want to disable Redis by default in new deployments, without
    impacting upgrade of existing deployments.

    Add a pre-check during upgrade and bail out if Redis is not
    enabled explicitely during upgrade and if the resource already
    exists in pacemaker. The pre-check is performed prior to
    os upgrade so that pacemaker is still installed and the cluster
    can still be inspected.

    Tested as follows:
      . FFU with redis-bundle not removed fails as expected
      . FFU with redis-bundle removed finishes
      . FFU when redis service is enabled post-FFU always finishes
      . re-running os-upgrade is idempotent

    Change-Id: Icd7503c9b9b5edc7ecfe20e6217fb8efeebf3140
    Closes-Bug: #1872645

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/wallaby
Review: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/825213

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/825213
Committed: https://opendev.org/openstack/tripleo-heat-templates/commit/9bd96ff045e5a27d3431b6a88a6d4186f0527749
Submitter: "Zuul (22348)"
Branch: stable/wallaby

commit 9bd96ff045e5a27d3431b6a88a6d4186f0527749
Author: Damien Ciabrini <email address hidden>
Date: Tue Nov 16 08:26:51 2021 +0100

    Check that redis is removed prior to FFU

    We want to disable Redis by default in new deployments, without
    impacting upgrade of existing deployments.

    Add a pre-check during upgrade and bail out if Redis is not
    enabled explicitely during upgrade and if the resource already
    exists in pacemaker. The pre-check is performed prior to
    os upgrade so that pacemaker is still installed and the cluster
    can still be inspected.

    Tested as follows:
      . FFU with redis-bundle not removed fails as expected
      . FFU with redis-bundle removed finishes
      . FFU when redis service is enabled post-FFU always finishes
      . re-running os-upgrade is idempotent

    Change-Id: Icd7503c9b9b5edc7ecfe20e6217fb8efeebf3140
    Closes-Bug: #1872645
    (cherry picked from commit 4236449451d4053fa5944fb4c9c78ea083d4145e)

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: master
Review: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/830671

[frigo (rigault-francois)]

I think above change reintroduce the bug?
The idea is to not have to install and operate a Redis data store when it's not needed.
Octavia dependency to Redis is only in the case where OctaviaEnableJobboard is true (I read false is the default) so I deduce that by default, even with Octavia deployed, dependency to Redis should not be enforced.
(so it would make more sense to have a new environment variable for Jobboard activation)

[OpenStack Infra (hudson-openstack)]

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

commit e66f495b1488430128c6671b4d3fee6a59950f18
Author: Brent Eagles <email address hidden>
Date: Wed Feb 23 17:39:32 2022 +0000

    Include redis templates in Octavia configuration

    Octavia depends on redis which isn't necessarily deployed by default so it
    should be included in the octavia environment files.

    Related-Bug: #1872645
    Change-Id: I98f7d0eabdda22a31c487a3259b380cb7412e87b

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/tripleo-heat-templates 16.0.0 release.

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: stable/wallaby
Review: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/850429

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/850429
Committed: https://opendev.org/openstack/tripleo-heat-templates/commit/387b9dd44d9923d9c3012564e7b64452585ab4fd
Submitter: "Zuul (22348)"
Branch: stable/wallaby

commit 387b9dd44d9923d9c3012564e7b64452585ab4fd
Author: Brent Eagles <email address hidden>
Date: Wed Feb 23 17:39:32 2022 +0000

    Include redis templates in Octavia configuration

    Octavia depends on redis which isn't necessarily deployed by default so it
    should be included in the octavia environment files.

    Related-Bug: #1872645
    Change-Id: I98f7d0eabdda22a31c487a3259b380cb7412e87b
    (cherry picked from commit e66f495b1488430128c6671b4d3fee6a59950f18)