From bd90e442ac4aa8b5caa5825e873ed0e188b7eb05 Mon Sep 17 00:00:00 2001 From: Tara Subedi Date: Tue, 2 Apr 2024 13:54:59 -0400 Subject: [PATCH] Implement DNS resolution for secondary pool addresses This commit adds host6 puppet module, that will be used to support dual-stack on /etc/hosts file rendering. Test Plan: [PASS] AIO-SX deployment - Test "dpkg -l puppet-module-uol-host6" - check presence of /usr/share/puppet/modules/host6 Story: 2011027 Task: 49801 Change-Id: I0fde31808fe671892582a3cdb2764f8b8c7b48b8 Signed-off-by: Tara Nath Subedi --- .../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 insertions(+) create mode 100644 config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/changelog create mode 100644 config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/control create mode 100644 config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/copyright create mode 100644 config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/puppet-module-uol-host6.install create mode 100644 config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/puppet-module-uol-host6.postinst create mode 100644 config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/puppet-module-uol-host6.postrm create mode 100644 config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/puppet-module-uol-host6.prerm create mode 100644 config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/rules create 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 new file mode 100644 index 000000000..5d0e4b263 --- /dev/null +++ b/config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/changelog @@ -0,0 +1,5 @@ +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 new file mode 100644 index 000000000..3ca1e5711 --- /dev/null +++ b/config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/control @@ -0,0 +1,13 @@ +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 new file mode 100644 index 000000000..23c968be4 --- /dev/null +++ b/config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/copyright @@ -0,0 +1,32 @@ +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 new file mode 100644 index 000000000..ad74e6247 --- /dev/null +++ b/config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/puppet-module-uol-host6.install @@ -0,0 +1,2 @@ +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 new file mode 100644 index 000000000..80df761bd --- /dev/null +++ b/config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/puppet-module-uol-host6.postinst @@ -0,0 +1,14 @@ +#!/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 new file mode 100644 index 000000000..789970266 --- /dev/null +++ b/config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/puppet-module-uol-host6.postrm @@ -0,0 +1,14 @@ +#!/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 new file mode 100644 index 000000000..8f8b714fd --- /dev/null +++ b/config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/puppet-module-uol-host6.prerm @@ -0,0 +1,14 @@ +#!/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 new file mode 100644 index 000000000..64b89e026 --- /dev/null +++ b/config/puppet-modules/puppet-module-uol-host6/debian/deb_folder/rules @@ -0,0 +1,8 @@ +#!/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 new file mode 100644 index 000000000..c43256b83 --- /dev/null +++ b/config/puppet-modules/puppet-module-uol-host6/debian/meta_data.yaml @@ -0,0 +1,9 @@ +--- +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 00e88f8ec..634b14109 100644 --- a/debian_iso_image.inc +++ b/debian_iso_image.inc @@ -352,6 +352,9 @@ 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 36c5335f6..dead23c29 100644 --- a/debian_pkg_dirs +++ b/debian_pkg_dirs @@ -35,6 +35,7 @@ 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