From f90757034042bf6cff6157e884fa226086f58aca Mon Sep 17 00:00:00 2001 From: Tara Nath Subedi Date: Mon, 6 May 2024 13:45:57 +0000 Subject: [PATCH] Revert "Implement DNS resolution for secondary pool addresses" This reverts commit bd90e442ac4aa8b5caa5825e873ed0e188b7eb05. Reason for revert: DNS resolution for secondary pool is decided to be withdrawn. Change-Id: Ib16289c3a9b5c321750a8c38b6972e93dc9579cf --- .../debian/deb_folder/changelog | 5 --- .../debian/deb_folder/control | 13 -------- .../debian/deb_folder/copyright | 32 ------------------- .../puppet-module-uol-host6.install | 2 -- .../puppet-module-uol-host6.postinst | 14 -------- .../deb_folder/puppet-module-uol-host6.postrm | 14 -------- .../deb_folder/puppet-module-uol-host6.prerm | 14 -------- .../debian/deb_folder/rules | 8 ----- .../debian/meta_data.yaml | 9 ------ debian_iso_image.inc | 3 -- debian_pkg_dirs | 1 - 11 files changed, 115 deletions(-) delete mode 100644 config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/changelog delete mode 100644 config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/control delete mode 100644 config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/copyright delete mode 100644 config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/puppet-module-uol-host6.install delete mode 100644 config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/puppet-module-uol-host6.postinst delete mode 100644 config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/puppet-module-uol-host6.postrm delete mode 100644 config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/puppet-module-uol-host6.prerm delete mode 100644 config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/rules delete mode 100644 config/puppet-modules/puppet-module-uol-host6/debian/meta_data.yaml diff --git a/config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/changelog b/config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/changelog deleted file mode 100644 index 5d0e4b263..000000000 --- a/config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/changelog +++ /dev/null @@ -1,5 +0,0 @@ -puppet-module-uol-host6 (0.0.1) UNRELEASED; urgency=medium - - * Initial release. - - -- Tara Nath Subedi Tue, 2 Apr 2024 09:46:51 -0500 diff --git a/config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/control b/config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/control deleted file mode 100644 index 3ca1e5711..000000000 --- a/config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/control +++ /dev/null @@ -1,13 +0,0 @@ -Source: puppet-module-uol-host6 -Section: admin -Priority: optional -Maintainer: StarlingX Developers -Build-Depends: debhelper-compat (= 13) -Standards-Version: 4.4.1 -Homepage: https://www.starlingx.io - -Package: puppet-module-uol-host6 -Architecture: any -Description: Puppet module named puppet-module-uol-host6 - This module manages IPv4 and IPv6 entries in /etc/hosts like the resource host from Puppetlabs. - This module is derived from the host resource from within puppet. Use like the resource host, but is keyed on IP. diff --git a/config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/copyright b/config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/copyright deleted file mode 100644 index 23c968be4..000000000 --- a/config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/copyright +++ /dev/null @@ -1,32 +0,0 @@ -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ - -Upstream-Name: host6 -Upstream-Contact: University of Leeds -Source: https://forge.puppet.com/modules/uol/host6 -Files: * -Copyright: 2014 University of Leeds -License: Apache-2 - -Upstream-Name: puppet-module-uol-host6 -Upstream-Contact: StarlingX Developers -Source: https://opendev.org/starlingx/integ/src/branch/master/config/puppet-modules/puppet-module-uol-host6 -Files: debian/* -Copyright: (c) 2024 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-module-uol-host6/debian/deb_folder/puppet-module-uol-host6.install b/config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/puppet-module-uol-host6.install deleted file mode 100644 index ad74e6247..000000000 --- a/config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/puppet-module-uol-host6.install +++ /dev/null @@ -1,2 +0,0 @@ -metadata.json usr/share/puppet/modules.available/puppet-module-uol-host6 -lib usr/share/puppet/modules.available/puppet-module-uol-host6 diff --git a/config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/puppet-module-uol-host6.postinst b/config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/puppet-module-uol-host6.postinst deleted file mode 100644 index 80df761bd..000000000 --- a/config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/puppet-module-uol-host6.postinst +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# see: dh_installdeb(1) - -set -e - -if [ "${1}" = "configure" ] ; then - update-alternatives --install /usr/share/puppet/modules/host6 puppet-module-uol-host6 \ - /usr/share/puppet/modules.available/puppet-module-uol-host6 500 -fi - -#DEBHELPER# - -exit 0 - diff --git a/config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/puppet-module-uol-host6.postrm b/config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/puppet-module-uol-host6.postrm deleted file mode 100644 index 789970266..000000000 --- a/config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/puppet-module-uol-host6.postrm +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# see: dh_installdeb(1) - -set -e - -if [ "${1}" = "remove" ] || [ "${1}" = "disappear" ]; then - update-alternatives --remove puppet-module-uol-host6 \ - /usr/share/puppet/modules.available/puppet-module-uol-host6 -fi - -#DEBHELPER# - -exit 0 - diff --git a/config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/puppet-module-uol-host6.prerm b/config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/puppet-module-uol-host6.prerm deleted file mode 100644 index 8f8b714fd..000000000 --- a/config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/puppet-module-uol-host6.prerm +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# see: dh_installdeb(1) - -set -e - -if [ "${1}" = "remove" ] || [ "${1}" = "upgrade" || [ "${1}" = "deconfigure" ]; then - update-alternatives --remove puppet-module-uol-host6 \ - /usr/share/puppet/modules.available/puppet-module-uol-host6 -fi - -#DEBHELPER# - -exit 0 - diff --git a/config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/rules b/config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/rules deleted file mode 100644 index 64b89e026..000000000 --- a/config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/rules +++ /dev/null @@ -1,8 +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-module-uol-host6/debian/meta_data.yaml b/config/puppet-modules/puppet-module-uol-host6/debian/meta_data.yaml deleted file mode 100644 index c43256b83..000000000 --- a/config/puppet-modules/puppet-module-uol-host6/debian/meta_data.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -debname: puppet-module-uol-host6 -debver: 0.0.1 -dl_path: - name: uol-host6-0.0.1.tar.gz - url: https://forge.puppet.com/v3/files/uol-host6-0.0.1.tar.gz - sha256sum: 3a36850a1d63c6d18ced763c839b94ce25e277d5fef1fdad35d01a4895a8ee26 -revision: - dist: $STX_DIST diff --git a/debian_iso_image.inc b/debian_iso_image.inc index 634b14109..00e88f8ec 100644 --- a/debian_iso_image.inc +++ b/debian_iso_image.inc @@ -352,9 +352,6 @@ puppet-module-puppetlabs-postgresql #puppetlabs-stdlib-5.0.0 puppet-module-puppetlabs-stdlib -#puppet-module-uol-host6 -puppet-module-uol-host6 - #puppet-zitrlp-strongswan puppet-zitrlp-strongswan diff --git a/debian_pkg_dirs b/debian_pkg_dirs index dead23c29..36c5335f6 100644 --- a/debian_pkg_dirs +++ b/debian_pkg_dirs @@ -35,7 +35,6 @@ config/puppet-modules/puppet-ldap config/puppet-modules/puppet-hash2stuff config/puppet-modules/puppet-lvm-1.4.0 config/puppet-modules/puppet-memcached -config/puppet-modules/puppet-module-uol-host6 config/puppet-modules/puppet-network config/puppet-modules/puppet-puppi config/puppet-modules/puppet-rabbitmq-8.5.0