integ/config/puppet-modules/openstack/puppet-oslo-11.3.0/centos/patches/0001-Remove-log_dir-from-conf-files.patch
Scott Little bab9bb6b69 Internal restructuring of stx-integ
Create new directories:
   ceph
   config
   config-files
   filesystem
   kernel
   kernel/kernel-modules
   ldap
   logging
   strorage-drivers
   tools
   utilities
   virt

Retire directories:
   connectivity
   core
   devtools
   support
   extended

Delete two packages:
   tgt
   irqbalance

Relocated packages:
   base/
      dhcp
      initscripts
      libevent
      lighttpd
      linuxptp
      memcached
      net-snmp
      novnc
      ntp
      openssh
      pam
      procps
      sanlock
      shadow
      sudo
      systemd
      util-linux
      vim
      watchdog

   ceph/
      python-cephclient

   config/
      facter
      puppet-4.8.2
      puppet-modules

   filesystem/
      e2fsprogs
      nfs-utils
      nfscheck

   kernel/
      kernel-std
      kernel-rt

   kernel/kernel-modules/
      mlnx-ofa_kernel

   ldap/
      nss-pam-ldapd
      openldap

   logging/
      syslog-ng
      logrotate

   networking/
      lldpd
      iproute
      mellanox
      python-ryu
      mlx4-config

   python/
      python-2.7.5
      python-django
      python-gunicorn
      python-setuptools
      python-smartpm
      python-voluptuous

   security/
      shim-signed
      shim-unsigned
      tboot

   strorage-drivers/
      python-3parclient
      python-lefthandclient

   virt/
      cloud-init
      libvirt
      libvirt-python
      qemu

   tools/
      storage-topology
      vm-topology

   utilities/
      tis-extensions
      namespace-utils
      nova-utils
      update-motd

Change-Id: I37ade764d873c701b35eac5881eb40412ba64a86
Story: 2002801
Task: 22687
Signed-off-by: Scott Little <scott.little@windriver.com>
2018-08-01 10:06:31 -04:00

37 lines
1.4 KiB
Diff

From b8dee2da527c3d3010e2b5b4e49f87f430afa826 Mon Sep 17 00:00:00 2001
From: Al Bailey <Al.Bailey@windriver.com>
Date: Fri, 3 Nov 2017 17:48:38 -0500
Subject: [PATCH] Remove log_dir from conf files
---
manifests/log.pp | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/manifests/log.pp b/manifests/log.pp
index 8778d46..771a674 100644
--- a/manifests/log.pp
+++ b/manifests/log.pp
@@ -27,9 +27,7 @@
# Defaults to $::os_service_default
#
# [*log_dir*]
-# (Optional) Directory where logs should be stored.
-# If set to $::os_service_default, it will not log to any directory.
-# Defaults to $::os_service_default
+# WRS: Remove log_dir to ensure services log via syslog
#
# [*watch_log_file*]
# (Optional) Uses logging handler designed to watch file system (boolean value).
@@ -136,7 +134,7 @@ define oslo::log(
'DEFAULT/log_config_append' => { value => $log_config_append },
'DEFAULT/log_date_format' => { value => $log_date_format },
'DEFAULT/log_file' => { value => $log_file },
- 'DEFAULT/log_dir' => { value => $log_dir },
+ 'DEFAULT/log_dir' => { ensure => absent },
'DEFAULT/watch_log_file' => { value => $watch_log_file },
'DEFAULT/use_syslog' => { value => $use_syslog },
'DEFAULT/syslog_log_facility' => { value => $syslog_log_facility },
--
1.8.3.1