Swift: Get rid of xinetd configuration

... because xinetd is no longer available in CentOS Stream 9. Current
puppet-rsync[1] and puppet-swift[2] supports disabling xinetd and
actually xinetd is now disabled by default in CentOS Stream 9.

[1] https://github.com/puppetlabs/puppetlabs-rsync/pull/139
[2] https://review.opendev.org/c/openstack/puppet-swift/+/795832

Change-Id: Iffc8756b9e5d2690338d508dda70a2e45361dd12
This commit is contained in:
Takashi Kajinami 2022-04-22 10:19:35 +09:00
parent cdb32139b5
commit 0e24d92e5a
1 changed files with 2 additions and 7 deletions

View File

@ -265,16 +265,11 @@ outputs:
service_config_settings: {}
# BEGIN DOCKER SETTINGS
# (bandini) - We can remove the xinetd noop lines once Centos8 is not supported anymore
puppet_config:
config_volume: swift
puppet_tags: swift_config,swift_container_config,swift_container_sync_realms_config,swift_account_config,swift_object_config,swift_object_expirer_config,rsync::server
step_config:
list_join:
- "\n"
- - "class xinetd() {}"
- "define xinetd::service($bind='',$port='',$server='',$server_args='') {}"
- "include tripleo::profile::base::swift::storage"
step_config: |
include tripleo::profile::base::swift::storage
config_image: {get_attr: [RoleParametersValue, value, ContainerSwiftConfigImage]}
kolla_config:
/var/lib/kolla/config_files/swift_account_auditor.json: