Merge "Fix swift "Could not enable rsyncd" error" into stable/wallaby
This commit is contained in:
commit
c9942913af
|
@ -204,6 +204,7 @@ outputs:
|
|||
- swift::storage::all::object_server_workers: {get_param: SwiftObjectWorkers}
|
||||
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
|
||||
|
@ -212,6 +213,7 @@ outputs:
|
|||
- "\n"
|
||||
- - "class xinetd() {}"
|
||||
- "define xinetd::service($bind='',$port='',$server='',$server_args='') {}"
|
||||
- "noop_resource('service')"
|
||||
- "include tripleo::profile::base::swift::storage"
|
||||
config_image: {get_param: ContainerSwiftConfigImage}
|
||||
kolla_config:
|
||||
|
|
Loading…
Reference in New Issue