swift: gid in rsyncd.conf is set to an empty value

[Takashi Kajinami]

Currently the gid option in rsync.conf is set to an empty value while this is supposed to be set to the group which stack user belongs to.

This is because the logic to replace value for the option is referring to the USER_GROUP variable which is not either declared or initialized.
 https://github.com/openstack/devstack/blob/c807a8bbfffd3400d97145a58c2745dc5076cd3f/lib/swift#L356

Because of this %GROUP% in the template file for rsync.conf is replaced by an empty string.

Example:
https://zuul.opendev.org/t/openstack/build/dfdd816fe56947a799c5362548bac65b/log/job-output.txt#5498
https://zuul.opendev.org/t/openstack/build/dfdd816fe56947a799c5362548bac65b/log/job-output.txt#5504

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.opendev.org/c/openstack/devstack/+/805484

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/devstack/+/805484
Committed: https://opendev.org/openstack/devstack/commit/25f84277eab5291aa0fa8c12ac39a69594611e08
Submitter: "Zuul (22348)"
Branch: master

commit 25f84277eab5291aa0fa8c12ac39a69594611e08
Author: Takashi Kajinami <email address hidden>
Date: Sat Aug 21 21:38:43 2021 +0900

    swift: Fix the empty gid option in rsyncd.conf

    This change fixes the empty value set to the gid option in rsyncd.conf,
    which was caused by reference to the invalid USER_GROUP variable, and
    ensures the option is set to the group which STACK_USER belongs to.

    This also fixes duplicate declaration of the local user_group variable.

    Closes-Bug: #1940742
    Change-Id: Ifd0a5ef0bc5f3647f43b169df1f7176393971853

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/wallaby
Review: https://review.opendev.org/c/openstack/devstack/+/806386

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/devstack/+/806386
Committed: https://opendev.org/openstack/devstack/commit/b995e5aff7b1161349fb1d450ab83ed14a59417c
Submitter: "Zuul (22348)"
Branch: stable/wallaby

commit b995e5aff7b1161349fb1d450ab83ed14a59417c
Author: Takashi Kajinami <email address hidden>
Date: Sat Aug 21 21:38:43 2021 +0900

    swift: Fix the empty gid option in rsyncd.conf

    This change fixes the empty value set to the gid option in rsyncd.conf,
    which was caused by reference to the invalid USER_GROUP variable, and
    ensures the option is set to the group which STACK_USER belongs to.

    This also fixes duplicate declaration of the local user_group variable.

    Closes-Bug: #1940742
    Change-Id: Ifd0a5ef0bc5f3647f43b169df1f7176393971853
    (cherry picked from commit 25f84277eab5291aa0fa8c12ac39a69594611e08)