From 4d2b188ec14da5801300b63f2d17c2ce0c90acce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Jeanneret?= Date: Tue, 10 Dec 2019 14:23:07 +0100 Subject: [PATCH] [Rocky and older] Actually install tmpwatch on overcloud nodes This is the equivalent of https://review.opendev.org/698232 but we can't backport it "as-is" due to the huge tree change. Closes-Bug: #1855802 Change-Id: I3cd1c343bba473e3f8c9da1f0933a4810d678e76 --- extraconfig/services/tmpwatch-install.yaml | 4 ++-- overcloud-resource-registry-puppet.j2.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extraconfig/services/tmpwatch-install.yaml b/extraconfig/services/tmpwatch-install.yaml index 97ada068e8..12716606c8 100644 --- a/extraconfig/services/tmpwatch-install.yaml +++ b/extraconfig/services/tmpwatch-install.yaml @@ -1,7 +1,7 @@ heat_template_version: rocky description: > - Install tmpwatch on the undercloud/standalone + Install tmpwatch parameters: EndpointMap: @@ -33,7 +33,7 @@ parameters: outputs: role_data: - description: Role data for tmpwatch install on undercloud or standalone + description: Role data for tmpwatch install value: service_name: logrotate_tmpwatch deploy_steps_tasks: diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 882a6becbf..f3092c5d63 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -341,7 +341,7 @@ resource_registry: OS::TripleO::Services::Multipathd: docker/services/multipathd.yaml # Logging - OS::TripleO::Services::Tmpwatch: OS::Heat::None + OS::TripleO::Services::Tmpwatch: extraconfig/services/tmpwatch-install.yaml OS::TripleO::Services::Logging::BarbicanApi: docker/services/logging/files/barbican-api.yaml OS::TripleO::Services::Logging::GlanceApi: docker/services/logging/files/glance-api.yaml OS::TripleO::Services::Logging::HAProxy: docker/services/logging/files/haproxy.yaml