Merge "Install tmpwatch on the overcloud" into stable/train

openstack-archive · Dec 19, 2019 · 7aff0b2 · 7aff0b2
2 parents 4186739 + 80be9b8
commit 7aff0b2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/deployment/logrotate/tmpwatch-install.yaml b/deployment/logrotate/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
@@ -333,7 +333,7 @@ resource_registry:
   OS::TripleO::Services::Multipathd: OS::Heat::None
 
   # Logging
-  OS::TripleO::Services::Tmpwatch: OS::Heat::None
+  OS::TripleO::Services::Tmpwatch: deployment/logrotate/tmpwatch-install.yaml
   OS::TripleO::Services::Logging::BarbicanApi: deployment/logging/files/barbican-api.yaml
   OS::TripleO::Services::Logging::GlanceApi: deployment/glance/glance-api-logging-file-container.yaml
   OS::TripleO::Services::Logging::HAProxy: deployment/logging/files/haproxy.yaml