From 344c2f9caec7c398246e9e1e65a1050253dcaec8 Mon Sep 17 00:00:00 2001 From: Andy Ning Date: Wed, 31 Aug 2022 15:08:12 -0400 Subject: [PATCH] Remove puppet-nslcd package on Debian nslcd has been replaced by sssd on Debian. The puppet-nslcd package is no longer needed. With this change, the package is no longer built and included in the image. Test Plan on Debian: PASS: image build PASS: After system deployed, verify puppet-nslcd package doesn't exist. PASS: openldap functions (user addition, user login on console and by ssh, etc) work properly. Story: 2009834 Task: 46174 Depends-On: https://review.opendev.org/c/starlingx/stx-puppet/+/855513 Signed-off-by: Andy Ning Change-Id: Ia29dc8e66fc1f7e7c537b4dea87511aba00f2217 --- .../puppet-nslcd/debian/deb_folder/changelog | 5 --- .../puppet-nslcd/debian/deb_folder/control | 16 ---------- .../puppet-nslcd/debian/deb_folder/copyright | 31 ------------------- .../debian/deb_folder/puppet-nslcd.install | 4 --- .../debian/deb_folder/puppet-nslcd.postinst | 13 -------- .../debian/deb_folder/puppet-nslcd.postrm | 13 -------- .../debian/deb_folder/puppet-nslcd.prerm | 13 -------- .../puppet-nslcd/debian/deb_folder/rules | 7 ----- .../debian/deb_folder/source/format | 1 - .../puppet-nslcd/debian/meta_data.yaml | 11 ------- debian_pkg_dirs | 1 - 11 files changed, 115 deletions(-) delete mode 100644 config/puppet-modules/puppet-nslcd/debian/deb_folder/changelog delete mode 100644 config/puppet-modules/puppet-nslcd/debian/deb_folder/control delete mode 100644 config/puppet-modules/puppet-nslcd/debian/deb_folder/copyright delete mode 100644 config/puppet-modules/puppet-nslcd/debian/deb_folder/puppet-nslcd.install delete mode 100644 config/puppet-modules/puppet-nslcd/debian/deb_folder/puppet-nslcd.postinst delete mode 100644 config/puppet-modules/puppet-nslcd/debian/deb_folder/puppet-nslcd.postrm delete mode 100644 config/puppet-modules/puppet-nslcd/debian/deb_folder/puppet-nslcd.prerm delete mode 100755 config/puppet-modules/puppet-nslcd/debian/deb_folder/rules delete mode 100644 config/puppet-modules/puppet-nslcd/debian/deb_folder/source/format delete mode 100644 config/puppet-modules/puppet-nslcd/debian/meta_data.yaml diff --git a/config/puppet-modules/puppet-nslcd/debian/deb_folder/changelog b/config/puppet-modules/puppet-nslcd/debian/deb_folder/changelog deleted file mode 100644 index 10fd45469..000000000 --- a/config/puppet-modules/puppet-nslcd/debian/deb_folder/changelog +++ /dev/null @@ -1,5 +0,0 @@ -puppet-nslcd (0.4.1-0) unstable; urgency=medium - - * Initial release - - -- Dan Voiculeasa Wed, 08 Sep 2021 11:50:43 +0000 diff --git a/config/puppet-modules/puppet-nslcd/debian/deb_folder/control b/config/puppet-modules/puppet-nslcd/debian/deb_folder/control deleted file mode 100644 index bc629ade4..000000000 --- a/config/puppet-modules/puppet-nslcd/debian/deb_folder/control +++ /dev/null @@ -1,16 +0,0 @@ -Source: puppet-nslcd -Section: admin -Priority: optional -Maintainer: StarlingX Developers -Build-Depends: debhelper-compat (= 13) -Standards-Version: 4.4.1 -Homepage: https://www.starlingx.io - -Package: puppet-nslcd -Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, - puppet, - puppet-module-puppetlabs-stdlib -Description: Puppet module named puppet-nslcd - A Puppet module for nslcd - local LDAP name service daemon diff --git a/config/puppet-modules/puppet-nslcd/debian/deb_folder/copyright b/config/puppet-modules/puppet-nslcd/debian/deb_folder/copyright deleted file mode 100644 index f9f06ac1a..000000000 --- a/config/puppet-modules/puppet-nslcd/debian/deb_folder/copyright +++ /dev/null @@ -1,31 +0,0 @@ -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ - -Upstream-Name: puppet-nslcd -Upstream-Contact: https://github.com/geekix -Source: https://github.com/geekix/puppet-nslcd/ -Files: * -Copyright: (C) 2015-2019 https://github.com/geekix -License: Apache-2 - -Upstream-Name: puppet-nslcd -Upstream-Contact: StarlingX Developers -Source: https://opendev.org/starlingx/integ/src/branch/master/config/puppet-modules/puppet-nslcd -Files: debian/* -Copyright: (c) 2021 Wind River Systems, Inc. -License: Apache-2 - -License: Apache-2 - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - . - http://www.apache.org/licenses/LICENSE-2.0 - . - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - . - On Debian-based systems the full text of the Apache version 2.0 license - can be found in `/usr/share/common-licenses/Apache-2.0'. diff --git a/config/puppet-modules/puppet-nslcd/debian/deb_folder/puppet-nslcd.install b/config/puppet-modules/puppet-nslcd/debian/deb_folder/puppet-nslcd.install deleted file mode 100644 index f419661f6..000000000 --- a/config/puppet-modules/puppet-nslcd/debian/deb_folder/puppet-nslcd.install +++ /dev/null @@ -1,4 +0,0 @@ -manifests usr/share/puppet/modules.available/puppet-nslcd -metadata.json usr/share/puppet/modules.available/puppet-nslcd -spec usr/share/puppet/modules.available/puppet-nslcd -templates usr/share/puppet/modules.available/puppet-nslcd diff --git a/config/puppet-modules/puppet-nslcd/debian/deb_folder/puppet-nslcd.postinst b/config/puppet-modules/puppet-nslcd/debian/deb_folder/puppet-nslcd.postinst deleted file mode 100644 index 0a78f1431..000000000 --- a/config/puppet-modules/puppet-nslcd/debian/deb_folder/puppet-nslcd.postinst +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# see: dh_installdeb(1) - -set -e - -if [ "${1}" = "configure" ] ; then - update-alternatives --install /usr/share/puppet/modules/nslcd puppet-module-nslcd \ - /usr/share/puppet/modules.available/puppet-nslcd 500 -fi - -#DEBHELPER# - -exit 0 diff --git a/config/puppet-modules/puppet-nslcd/debian/deb_folder/puppet-nslcd.postrm b/config/puppet-modules/puppet-nslcd/debian/deb_folder/puppet-nslcd.postrm deleted file mode 100644 index ca1efc747..000000000 --- a/config/puppet-modules/puppet-nslcd/debian/deb_folder/puppet-nslcd.postrm +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# see: dh_installdeb(1) - -set -e - -if [ "${1}" = "remove" ] || [ "${1}" = "disappear" ]; then - update-alternatives --remove puppet-module-nslcd \ - /usr/share/puppet/modules.available/puppet-nslcd -fi - -#DEBHELPER# - -exit 0 diff --git a/config/puppet-modules/puppet-nslcd/debian/deb_folder/puppet-nslcd.prerm b/config/puppet-modules/puppet-nslcd/debian/deb_folder/puppet-nslcd.prerm deleted file mode 100644 index b6841f46a..000000000 --- a/config/puppet-modules/puppet-nslcd/debian/deb_folder/puppet-nslcd.prerm +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# see: dh_installdeb(1) - -set -e - -if [ "${1}" = "remove" ] || [ "${1}" = "upgrade" || [ "${1}" = "deconfigure" ]; then - update-alternatives --remove puppet-module-nslcd \ - /usr/share/puppet/modules.available/puppet-nslcd -fi - -#DEBHELPER# - -exit 0 diff --git a/config/puppet-modules/puppet-nslcd/debian/deb_folder/rules b/config/puppet-modules/puppet-nslcd/debian/deb_folder/rules deleted file mode 100755 index f00dbc24f..000000000 --- a/config/puppet-modules/puppet-nslcd/debian/deb_folder/rules +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/make -f -# See debhelper(7) (uncomment to enable) -# output every command that modifies files on the build system. -#export DH_VERBOSE = 1 - -%: - dh $@ diff --git a/config/puppet-modules/puppet-nslcd/debian/deb_folder/source/format b/config/puppet-modules/puppet-nslcd/debian/deb_folder/source/format deleted file mode 100644 index 163aaf8d8..000000000 --- a/config/puppet-modules/puppet-nslcd/debian/deb_folder/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/config/puppet-modules/puppet-nslcd/debian/meta_data.yaml b/config/puppet-modules/puppet-nslcd/debian/meta_data.yaml deleted file mode 100644 index d4cd4eda8..000000000 --- a/config/puppet-modules/puppet-nslcd/debian/meta_data.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -debname: puppet-nslcd -debver: 0.4.1-0 -dl_path: - name: puppet-nslcd-0.4.1-0.tar.gz - url: https://codeload.github.com/geekix/puppet-nslcd/tar.gz/d3c616497151c2e8df746cfe47bac966422abc4c - md5sum: 028092acf259a3fbf4bd03612e98f85b - sha256sum: f8fd830683a4c96711c0922a18c33978b8b70d044cc663e4270ccacf740cb113 -revision: - dist: $STX_DIST - PKG_GITREVCOUNT: true diff --git a/debian_pkg_dirs b/debian_pkg_dirs index de44351d9..afd6b6352 100644 --- a/debian_pkg_dirs +++ b/debian_pkg_dirs @@ -32,7 +32,6 @@ config/puppet-modules/puppetlabs-stdlib-5.0.0 config/puppet-modules/puppet-ldap config/puppet-modules/puppet-lvm-1.4.0 config/puppet-modules/puppet-network -config/puppet-modules/puppet-nslcd config/puppet-modules/puppet-puppi config/puppet-modules/puppet-rabbitmq-8.5.0 config/puppet-modules/puppet-staging