integ/ldap/openldap/centos/meta_patches/openldap-remove-ldap-conf-cgcs-file.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

34 lines
1.1 KiB
Diff

From e3b655b415b04559e558c6f5dadbd6c6e95af33f Mon Sep 17 00:00:00 2001
From: Saju Oommen <saju.oommen@windriver.com>
Date: Mon, 15 Jan 2018 13:59:26 -0500
Subject: [PATCH 1/1] remove-ldap-conf-cgcs-file
---
SPECS/openldap.spec | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/SPECS/openldap.spec b/SPECS/openldap.spec
index 50bb499..50937c0 100644
--- a/SPECS/openldap.spec
+++ b/SPECS/openldap.spec
@@ -25,7 +25,6 @@ Source54: libexec-create-certdb.sh
Source55: libexec-generate-server-cert.sh
# WRS:
-Source56: ldap.conf.cgcs
Source57: slapd.conf.cgcs
Source58: initial_config.ldif
Source60: initscript
@@ -446,7 +445,7 @@ rm -f %{buildroot}%{_localstatedir}/openldap-data/DB_CONFIG.example
rmdir %{buildroot}%{_localstatedir}/openldap-data
# WRS: slapd-config is backward compatible with slapd.conf
-install -m 600 %{SOURCE56} %{buildroot}%{_sysconfdir}/openldap/ldap.conf
+# WRS: SOURCE56 (ldap.conf.cgcs) is replaced by puppet template
install -m 600 %{SOURCE57} %{buildroot}%{_sysconfdir}/openldap/slapd.conf
install -m 600 %{SOURCE58} %{buildroot}%{_sysconfdir}/openldap/initial_config.ldif
--
1.8.3.1