object-expirer options should be written to object-server.conf

[Takashi Kajinami]

Since the following change has been merged to swift, we can put object-expirer options into object-server.conf instead of object-expirer.conf, and object-expirer.conf has been deprecated.

https://github.com/openstack/swift/commit/443f029a584c5bb7dd7b910ddacd8fa562272dfb

Thus we should put all object-expirer options into object-swift.conf .

Note that each distro still uses object-server.conf at the time of writing, thus we should be careful that both files are maintained.

[Takashi Kajinami (kajinamit)]

Note:
When we make this change we should also consider how we deal with the change about placement of object-expirer service. This service is used to be located at proxy servers but now located at storage servers.

[Rabi Mishra (rabi)]

> When we make this change we should also consider how we deal with the change about placement of object-expirer service.

Not sure What does puppet-swift have to do with it? From TripleO perspective it's always been in OS::TripleO::Services::SwiftStorage (deployment/swift/swift-storage-container-puppet.yaml) and would stay there. Just that it would use the object-server image as changed in https://review.opendev.org/c/openstack/tripleo-heat-templates/+/782746.

[Rabi Mishra (rabi)]

I guess adding object-expirer section in object-server.conf along with writing it to object-expirer.conf would not break existing deployments and with distributions that have not yet removed object-expirer.conf (and puppet-swift still writes to it), can still collocate object-expirer service on proxy servers?

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/puppet-swift/+/850122
Committed: https://opendev.org/openstack/puppet-swift/commit/efcef86de7ba859197aecd791b3b390a220a66d8
Submitter: "Zuul (22348)"
Branch: master

commit efcef86de7ba859197aecd791b3b390a220a66d8
Author: Takashi Kajinami <email address hidden>
Date: Mon Jul 18 11:47:09 2022 +0900

    Support customizing internal-client.conf

    This change introduces capability to customize internal-client.conf,
    which is used by several daemon processes like container-sharder.

    Closes-Bug: #1986599
    Related-Bug: #1921319
    Change-Id: I200e3a4ff323a07778ec6c4d7dd96824c72a12cf

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/puppet-swift/+/849055
Committed: https://opendev.org/openstack/puppet-swift/commit/453b1a97311dfa9b3fc186e13af037e2ce27b117
Submitter: "Zuul (22348)"
Branch: master

commit 453b1a97311dfa9b3fc186e13af037e2ce27b117
Author: Takashi Kajinami <email address hidden>
Date: Fri Jul 8 10:40:03 2022 +0900

    Use ini provider to manage storage config files

    With this change now config files for storage services(account,
    container and object) are managed by ini provider instead of concat
    resources. This allows us to use the default file provided by packages
    instead of replacing the whole file content by our templates, and use
    the $::os_service_default value instead of hard-coding own defaults.

    Related-Bug: #1921319
    Change-Id: I375634214e88acc5075f64090287f934ce8451d1

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: stable/yoga
Review: https://review.opendev.org/c/openstack/puppet-swift/+/853641

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/puppet-swift/+/853641
Committed: https://opendev.org/openstack/puppet-swift/commit/ab3cf92d79615453b041b67233a38daf70467331
Submitter: "Zuul (22348)"
Branch: stable/yoga

commit ab3cf92d79615453b041b67233a38daf70467331
Author: Takashi Kajinami <email address hidden>
Date: Mon Jul 18 11:47:09 2022 +0900

    Support customizing internal-client.conf

    This change introduces capability to customize internal-client.conf,
    which is used by several daemon processes like container-sharder.

    Closes-Bug: #1986599
    Related-Bug: #1921319
    Change-Id: I200e3a4ff323a07778ec6c4d7dd96824c72a12cf
    (cherry picked from commit efcef86de7ba859197aecd791b3b390a220a66d8)

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: stable/xena
Review: https://review.opendev.org/c/openstack/puppet-swift/+/853766

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/puppet-swift/+/853766
Committed: https://opendev.org/openstack/puppet-swift/commit/b5cb280779127e3a7924573f280de7c6456aa311
Submitter: "Zuul (22348)"
Branch: stable/xena

commit b5cb280779127e3a7924573f280de7c6456aa311
Author: Takashi Kajinami <email address hidden>
Date: Mon Jul 18 11:47:09 2022 +0900

    Support customizing internal-client.conf

    This change introduces capability to customize internal-client.conf,
    which is used by several daemon processes like container-sharder.

    Backport note:
    Replaced swift::params::user by the hard-coded user name because
    f781eb9e34501b651d3f2069fc8848e7cacef679 is present only in yoga and
    later.

    Closes-Bug: #1986599
    Related-Bug: #1921319
    Change-Id: I200e3a4ff323a07778ec6c4d7dd96824c72a12cf
    (cherry picked from commit efcef86de7ba859197aecd791b3b390a220a66d8)
    (cherry picked from commit ab3cf92d79615453b041b67233a38daf70467331)

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: stable/wallaby
Review: https://review.opendev.org/c/openstack/puppet-swift/+/854131

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/puppet-swift/+/854131
Committed: https://opendev.org/openstack/puppet-swift/commit/4267671c250c0b980d97a23a3f59c1a7c184a07f
Submitter: "Zuul (22348)"
Branch: stable/wallaby

commit 4267671c250c0b980d97a23a3f59c1a7c184a07f
Author: Takashi Kajinami <email address hidden>
Date: Mon Jul 18 11:47:09 2022 +0900

    Support customizing internal-client.conf

    This change introduces capability to customize internal-client.conf,
    which is used by several daemon processes like container-sharder.

    Backport note:
    Replaced swift::params::user by the hard-coded user name because
    f781eb9e34501b651d3f2069fc8848e7cacef679 is present only in yoga and
    later.

    Closes-Bug: #1986599
    Related-Bug: #1921319
    Change-Id: I200e3a4ff323a07778ec6c4d7dd96824c72a12cf
    (cherry picked from commit efcef86de7ba859197aecd791b3b390a220a66d8)
    (cherry picked from commit ab3cf92d79615453b041b67233a38daf70467331)
    (cherry picked from commit b5cb280779127e3a7924573f280de7c6456aa311)