Browse Source

Merge "[Rocky and older] Actually install tmpwatch on overcloud nodes" into stable/queens

changes/20/699420/2
Zuul Gerrit Code Review 2 months ago
parent
commit
15e86c65c6
2 changed files with 3 additions and 3 deletions
  1. +2
    -2
      extraconfig/services/tmpwatch-install.yaml
  2. +1
    -1
      overcloud-resource-registry-puppet.j2.yaml

+ 2
- 2
extraconfig/services/tmpwatch-install.yaml View File

@@ -1,7 +1,7 @@
heat_template_version: queens

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
host_prep_tasks:


+ 1
- 1
overcloud-resource-registry-puppet.j2.yaml View File

@@ -356,7 +356,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


Loading…
Cancel
Save