openstack/tripleo-heat-templates
Code Issues Proposed changes

Swift: Do not enable the whole rsync::server class

Browse Source 
In puppet run for swift, we enable the entire rsync::server class and
this sometimes results in unexpected package installation inside
the container-puppet-swift container.

Because we only need file/concat resources defined in the class since
we get rid of xinetd for CentOS 9 and these resources are enabled by
default, this change removes that entire class from tags.

Related-Bug: #1979204
Change-Id: I7e29a6e797155ca5c5aa27996a4e35e688061b6f
This commit is contained in:
Takashi Kajinami 2022-06-16 22:03:42 +09:00
parent e1afca352e
commit 13e84c4f5c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deployment/swift/swift-storage-container-puppet.yaml
View File

@ -225,6 +225,7 @@ outputs:
params:
$NETWORK: {get_param: [ServiceNetMap, SwiftStorageNetwork]}
rsync::server::pid_file: 'UNSET'
rsync::server::use_xinetd: false
swift::objectexpirer::cache_tls_enabled: {get_param: MemcachedTLS}
swift::storage::all::account_server_workers:
if:
@ -253,7 +254,7 @@ outputs:
# BEGIN DOCKER SETTINGS
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
puppet_tags: swift_config,swift_container_config,swift_container_sync_realms_config,swift_account_config,swift_object_config,swift_object_expirer_config
step_config: |
include tripleo::profile::base::swift::storage
config_image: {get_attr: [RoleParametersValue, value, ContainerSwiftConfigImage]}