openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Deprecate xinetd service management"

Browse Source
This commit is contained in:
Zuul 2019-02-21 18:55:15 +00:00 committed by Gerrit Code Review
commit 9ded745e65
8 changed files with 8 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
docker/services/xinetd.yaml
View File

@ -1,59 +0,0 @@
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 == 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

2
overcloud-resource-registry-puppet.j2.yaml
View File

@ -227,7 +227,7 @@ resource_registry:
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
OS::TripleO::Services::Xinetd: OS::Heat::None
# Time sync services
OS::TripleO::Services::Chrony: deployment/timesync/chrony-baremetal-ansible.yaml

7
releasenotes/notes/deprecate-xinetd-service.yaml-d7594bf8a7b714e2.yaml Normal file
View File

@ -0,0 +1,7 @@
---
deprecations:
- |
Xinetd tripleo service is no longer managed. The xinetd service hasn't been
managed since the switch to containers. OS::TripleO::Services::Xinetd is
disabled by default and dropped from the roles. The
OS::TripleO::Services::Xinetd will be removed in Train.

1
roles/Controller.yaml
View File

@ -186,4 +186,3 @@
- OS::TripleO::Services::Tuned
- OS::TripleO::Services::Vpp
- OS::TripleO::Services::Zaqar
- OS::TripleO::Services::Xinetd

1
roles/ControllerNoCeph.yaml
View File

@ -179,4 +179,3 @@
- OS::TripleO::Services::Tuned
- OS::TripleO::Services::Vpp
- OS::TripleO::Services::Zaqar
- OS::TripleO::Services::Xinetd

1
roles/Undercloud.yaml
View File

@ -95,4 +95,3 @@
- OS::TripleO::Services::UndercloudUpgrade
- OS::TripleO::Services::TripleoValidations
- OS::TripleO::Services::Zaqar
- OS::TripleO::Services::Xinetd

1
roles_data.yaml
View File

@ -189,7 +189,6 @@
- OS::TripleO::Services::Tuned
- OS::TripleO::Services::Vpp
- OS::TripleO::Services::Zaqar
- OS::TripleO::Services::Xinetd
###############################################################################
# Role: Compute #
###############################################################################

1
roles_data_undercloud.yaml
View File

@ -98,5 +98,4 @@
- OS::TripleO::Services::UndercloudUpgrade
- OS::TripleO::Services::TripleoValidations
- OS::TripleO::Services::Zaqar
- OS::TripleO::Services::Xinetd