diff --git a/deployment/swift/swift-storage-container-puppet.yaml b/deployment/swift/swift-storage-container-puppet.yaml index e78646adc7..998a785bd4 100644 --- a/deployment/swift/swift-storage-container-puppet.yaml +++ b/deployment/swift/swift-storage-container-puppet.yaml @@ -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: