diff --git a/docker/services/xinetd.yaml b/docker/services/xinetd.yaml deleted file mode 100644 index 52dea8c919..0000000000 --- a/docker/services/xinetd.yaml +++ /dev/null @@ -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 diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index f560acb060..a06755e94f 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -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 diff --git a/releasenotes/notes/deprecate-xinetd-service.yaml-d7594bf8a7b714e2.yaml b/releasenotes/notes/deprecate-xinetd-service.yaml-d7594bf8a7b714e2.yaml new file mode 100644 index 0000000000..342864b174 --- /dev/null +++ b/releasenotes/notes/deprecate-xinetd-service.yaml-d7594bf8a7b714e2.yaml @@ -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. diff --git a/roles/Controller.yaml b/roles/Controller.yaml index f22c8327d7..b93ec6a2d0 100644 --- a/roles/Controller.yaml +++ b/roles/Controller.yaml @@ -186,4 +186,3 @@ - OS::TripleO::Services::Tuned - OS::TripleO::Services::Vpp - OS::TripleO::Services::Zaqar - - OS::TripleO::Services::Xinetd diff --git a/roles/ControllerNoCeph.yaml b/roles/ControllerNoCeph.yaml index c2d0649dae..97034a66c1 100644 --- a/roles/ControllerNoCeph.yaml +++ b/roles/ControllerNoCeph.yaml @@ -179,4 +179,3 @@ - OS::TripleO::Services::Tuned - OS::TripleO::Services::Vpp - OS::TripleO::Services::Zaqar - - OS::TripleO::Services::Xinetd diff --git a/roles/Undercloud.yaml b/roles/Undercloud.yaml index 3232ead5ed..8eb74ebc4d 100644 --- a/roles/Undercloud.yaml +++ b/roles/Undercloud.yaml @@ -95,4 +95,3 @@ - OS::TripleO::Services::UndercloudUpgrade - OS::TripleO::Services::TripleoValidations - OS::TripleO::Services::Zaqar - - OS::TripleO::Services::Xinetd diff --git a/roles_data.yaml b/roles_data.yaml index 4565a351b5..c821aa9922 100644 --- a/roles_data.yaml +++ b/roles_data.yaml @@ -189,7 +189,6 @@ - OS::TripleO::Services::Tuned - OS::TripleO::Services::Vpp - OS::TripleO::Services::Zaqar - - OS::TripleO::Services::Xinetd ############################################################################### # Role: Compute # ############################################################################### diff --git a/roles_data_undercloud.yaml b/roles_data_undercloud.yaml index 44cc1824f0..f667d28876 100644 --- a/roles_data_undercloud.yaml +++ b/roles_data_undercloud.yaml @@ -98,5 +98,4 @@ - OS::TripleO::Services::UndercloudUpgrade - OS::TripleO::Services::TripleoValidations - OS::TripleO::Services::Zaqar - - OS::TripleO::Services::Xinetd