Allow to remove xinetd service
The xinetd service isn't used anymore on the host - it runs in containers where it is needed, meaning that service can be dropped for good, as well as its package. Change-Id: I004a43c1b6c9cee21c24749bd6589435530e48e0
This commit is contained in:
parent
311c2de714
commit
6237903852
66
docker/services/xinetd.yaml
Normal file
66
docker/services/xinetd.yaml
Normal file
@ -0,0 +1,66 @@
|
||||
heat_template_version: rocky
|
||||
|
||||
description: >
|
||||
Drop xinetd if operator requests it.
|
||||
|
||||
parameters:
|
||||
DefaultPasswords:
|
||||
default: {}
|
||||
type: json
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
via parameter_defaults in the resource registry.
|
||||
type: json
|
||||
ServiceData:
|
||||
default: {}
|
||||
description: Dictionary packing service data
|
||||
type: json
|
||||
ServiceNetMap:
|
||||
default: {}
|
||||
description: Mapping of service_name -> network name. Typically set
|
||||
via parameter_defaults in the resource registry. This
|
||||
mapping overrides those in ServiceNetMapDefaults.
|
||||
type: json
|
||||
RoleName:
|
||||
default: ''
|
||||
description: Role name on which the service is applied
|
||||
type: string
|
||||
RoleParameters:
|
||||
default: {}
|
||||
description: Parameters specific to the role
|
||||
type: json
|
||||
UpgradeRemoveUnusedPackages:
|
||||
default: false
|
||||
type: boolean
|
||||
description: Remove package if the service is being disabled during upgrade
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Remove xinetd since it is not used anymore in containerized environment
|
||||
value:
|
||||
service_name: xinetd
|
||||
docker_config: {}
|
||||
puppet_config:
|
||||
config_volume: ''
|
||||
step_config: ''
|
||||
config_image: ''
|
||||
config_settings: {}
|
||||
upgrade_tasks:
|
||||
- when: step|int == 2
|
||||
block:
|
||||
- name: stop and deactivate xinetd service
|
||||
service:
|
||||
name: xinetd
|
||||
state: stopped
|
||||
enabled: no
|
||||
- when: step|int == 3
|
||||
block:
|
||||
- name: set remove_xinetd_pkg fact
|
||||
set_fact:
|
||||
remove_xinetd_pkg: {get_param: UpgradeRemoveUnusedPackages}
|
||||
- name: remove xinetd package
|
||||
package:
|
||||
name: xinetd
|
||||
state: removed
|
||||
when: remove_xinetd_pkg|bool
|
@ -225,7 +225,8 @@ resource_registry:
|
||||
OS::TripleO::Services::GnocchiApi: docker/services/gnocchi-api.yaml
|
||||
OS::TripleO::Services::GnocchiMetricd: docker/services/gnocchi-metricd.yaml
|
||||
OS::TripleO::Services::GnocchiStatsd: docker/services/gnocchi-statsd.yaml
|
||||
|
||||
# Drop Xinetd
|
||||
OS::TripleO::Services::Xinetd: docker/services/xinetd.yaml
|
||||
|
||||
|
||||
# Services that are disabled by default (use relevant environment files):
|
||||
|
8
releasenotes/notes/remove-xinetd-859f2a31631774d1.yaml
Normal file
8
releasenotes/notes/remove-xinetd-859f2a31631774d1.yaml
Normal file
@ -0,0 +1,8 @@
|
||||
---
|
||||
features:
|
||||
- Allows to stop and disable xinetd service, as it not used anymore.
|
||||
- Allows to remove xinetd package when UpgradeRemoveUnusedPackages is set to
|
||||
"True".
|
||||
deprecations:
|
||||
- xinetd service is deprecated, so we stop it, disable it, and optionnaly
|
||||
remove its package.
|
@ -178,3 +178,4 @@
|
||||
- OS::TripleO::Services::Vpp
|
||||
- OS::TripleO::Services::Zaqar
|
||||
- OS::TripleO::Services::Ptp
|
||||
- OS::TripleO::Services::Xinetd
|
||||
|
@ -171,3 +171,4 @@
|
||||
- OS::TripleO::Services::Vpp
|
||||
- OS::TripleO::Services::Zaqar
|
||||
- OS::TripleO::Services::Ptp
|
||||
- OS::TripleO::Services::Xinetd
|
||||
|
@ -87,3 +87,4 @@
|
||||
- OS::TripleO::Services::UndercloudUpgrade
|
||||
- OS::TripleO::Services::TripleoValidations
|
||||
- OS::TripleO::Services::Zaqar
|
||||
- OS::TripleO::Services::Xinetd
|
||||
|
@ -181,6 +181,7 @@
|
||||
- OS::TripleO::Services::Vpp
|
||||
- OS::TripleO::Services::Zaqar
|
||||
- OS::TripleO::Services::Ptp
|
||||
- OS::TripleO::Services::Xinetd
|
||||
###############################################################################
|
||||
# Role: Compute #
|
||||
###############################################################################
|
||||
|
@ -90,4 +90,5 @@
|
||||
- OS::TripleO::Services::UndercloudUpgrade
|
||||
- OS::TripleO::Services::TripleoValidations
|
||||
- OS::TripleO::Services::Zaqar
|
||||
- OS::TripleO::Services::Xinetd
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user