bab9bb6b69
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>
42 lines
1.6 KiB
Diff
42 lines
1.6 KiB
Diff
From 90d515932132d54d5a3ce7091dcd16f537f24d59 Mon Sep 17 00:00:00 2001
|
|
From: Joseph Richard <Joseph.Richard@windriver.com>
|
|
Date: Fri, 10 Nov 2017 11:31:49 -0500
|
|
Subject: [PATCH 2/8] Remove broken authtoken references
|
|
|
|
---
|
|
manifests/logging.pp | 16 +++++-----------
|
|
1 file changed, 5 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/manifests/logging.pp b/manifests/logging.pp
|
|
index acb376d..d06cbd4 100644
|
|
--- a/manifests/logging.pp
|
|
+++ b/manifests/logging.pp
|
|
@@ -121,19 +121,13 @@ class neutron::logging (
|
|
|
|
include ::neutron::deps
|
|
|
|
- $debug_real = pick($::neutron::debug,$debug)
|
|
- $use_syslog_real = pick($::neutron::use_syslog,$use_syslog)
|
|
- $use_stderr_real = pick($::neutron::use_stderr,$use_stderr)
|
|
- $log_file_real = pick($::neutron::log_file,$log_file)
|
|
- $log_dir_real = pick($::neutron::log_dir,$log_dir)
|
|
-
|
|
oslo::log { 'neutron_config':
|
|
- debug => $debug_real,
|
|
- use_stderr => $use_stderr_real,
|
|
- use_syslog => $use_syslog_real,
|
|
+ debug => $debug,
|
|
+ use_stderr => $use_stderr,
|
|
+ use_syslog => $use_syslog,
|
|
syslog_log_facility => $syslog_log_facility,
|
|
- log_file => $log_file_real,
|
|
- log_dir => $log_dir_real,
|
|
+ log_file => $log_file,
|
|
+ log_dir => $log_dir,
|
|
log_config_append => $log_config_append,
|
|
log_date_format => $log_date_format,
|
|
watch_log_file => $watch_log_file,
|
|
--
|
|
1.8.3.1
|
|
|