From 710561e26d8e7fb1ed6e27e9155d41c83791d9e4 Mon Sep 17 00:00:00 2001 From: Fabiano Correa Mercer Date: Wed, 1 Nov 2023 15:19:13 -0300 Subject: [PATCH] Add puppet-memcached with FQDN support The new release allows the use of hostname/FQDN to configure the memcached. It is necessary to configure the parameter "listen" instead of "listen_ip" (deprecated). The use of FQDN is necessary to allow the reconfiguration of the MGMT network. The management network is used extensively for all internal communication. Since the original use of the network was a private network before it was exposed for external communication in ai distributed cloud configuration, it was never designed to be reconfigured. To support MGMT network reconfiguration the idea is to configure the applications to use the hostname/FQDN instead of a static MGMT IP address. In this way, the MGMT network can be changed and the services and applications will still work since they are using the hostname/FQDN and the DNS will be responsible to translate to the current MGMT IP address. Given the complexities of supporting the multi-host reconfiguration, this task will focus on support for AIO-SX only. Test plan ( Debian only ) - AIO-SX and AIO-DX virtualbox installation - netstat -tupl ( no services are using the MGMT IP address ) Story: 2010722 Task: 48464 Depends-on: https://review.opendev.org/c/starlingx/config/+/886208 Change-Id: Ic45b9ea8055d81dd778267bf77326ad4f641d166 Signed-off-by: Fabiano Correa Mercer --- .../0001-Change-memcached-dependency.patch | 27 ++++++++++++++++ .../debian/deb_patches/series | 1 + .../0002-Remove-memcached-dependency.patch | 29 +++++++++++++++++ .../debian/patches/series | 1 + .../debian/deb_folder/changelog | 5 +++ .../debian/deb_folder/control | 13 ++++++++ .../debian/deb_folder/copyright | 31 +++++++++++++++++++ .../deb_folder/puppet-memcached.install | 6 ++++ .../deb_folder/puppet-memcached.postinst | 13 ++++++++ .../debian/deb_folder/puppet-memcached.postrm | 13 ++++++++ .../debian/deb_folder/puppet-memcached.prerm | 13 ++++++++ .../puppet-memcached/debian/deb_folder/rules | 7 +++++ .../debian/deb_folder/source/format | 1 + .../puppet-memcached/debian/meta_data.yaml | 11 +++++++ debian_iso_image.inc | 3 ++ debian_pkg_dirs | 1 + 16 files changed, 175 insertions(+) create mode 100644 config/puppet-modules/openstack/puppet-horizon-17.4.0/debian/deb_patches/0001-Change-memcached-dependency.patch create mode 100644 config/puppet-modules/openstack/puppet-horizon-17.4.0/debian/deb_patches/series create mode 100644 config/puppet-modules/openstack/puppet-horizon-17.4.0/debian/patches/0002-Remove-memcached-dependency.patch create mode 100644 config/puppet-modules/puppet-memcached/debian/deb_folder/changelog create mode 100644 config/puppet-modules/puppet-memcached/debian/deb_folder/control create mode 100644 config/puppet-modules/puppet-memcached/debian/deb_folder/copyright create mode 100644 config/puppet-modules/puppet-memcached/debian/deb_folder/puppet-memcached.install create mode 100644 config/puppet-modules/puppet-memcached/debian/deb_folder/puppet-memcached.postinst create mode 100644 config/puppet-modules/puppet-memcached/debian/deb_folder/puppet-memcached.postrm create mode 100644 config/puppet-modules/puppet-memcached/debian/deb_folder/puppet-memcached.prerm create mode 100755 config/puppet-modules/puppet-memcached/debian/deb_folder/rules create mode 100644 config/puppet-modules/puppet-memcached/debian/deb_folder/source/format create mode 100644 config/puppet-modules/puppet-memcached/debian/meta_data.yaml diff --git a/config/puppet-modules/openstack/puppet-horizon-17.4.0/debian/deb_patches/0001-Change-memcached-dependency.patch b/config/puppet-modules/openstack/puppet-horizon-17.4.0/debian/deb_patches/0001-Change-memcached-dependency.patch new file mode 100644 index 000000000..fa9191567 --- /dev/null +++ b/config/puppet-modules/openstack/puppet-horizon-17.4.0/debian/deb_patches/0001-Change-memcached-dependency.patch @@ -0,0 +1,27 @@ +From 7bd6c2bddb9285af15988247a8fbee2e56fd8a18 Mon Sep 17 00:00:00 2001 +From: Teresa Ho +Date: Mon, 17 Jul 2023 17:56:27 -0400 +Subject: [PATCH 1/2] Change memcached dependency + +Signed-off-by: Teresa Ho +Signed-off-by: Fabiano Correa Mercer +--- + debian/control | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/debian/control b/debian/control +index 58c178c..3239aa7 100644 +--- a/debian/control ++++ b/debian/control +@@ -22,7 +22,7 @@ Depends: + puppet-module-openstacklib (>= 17.4.0), + puppet-module-puppetlabs-apache (>= 5.0.0), + puppet-module-puppetlabs-stdlib, +- puppet-module-saz-memcached, ++ puppet-memcached, + ${misc:Depends}, + Description: Puppet module for OpenStack Horizon + Puppet lets you centrally manage every important aspect of your system using a +-- +2.25.1 + diff --git a/config/puppet-modules/openstack/puppet-horizon-17.4.0/debian/deb_patches/series b/config/puppet-modules/openstack/puppet-horizon-17.4.0/debian/deb_patches/series new file mode 100644 index 000000000..04432c684 --- /dev/null +++ b/config/puppet-modules/openstack/puppet-horizon-17.4.0/debian/deb_patches/series @@ -0,0 +1 @@ +0001-Change-memcached-dependency.patch diff --git a/config/puppet-modules/openstack/puppet-horizon-17.4.0/debian/patches/0002-Remove-memcached-dependency.patch b/config/puppet-modules/openstack/puppet-horizon-17.4.0/debian/patches/0002-Remove-memcached-dependency.patch new file mode 100644 index 000000000..2905021c4 --- /dev/null +++ b/config/puppet-modules/openstack/puppet-horizon-17.4.0/debian/patches/0002-Remove-memcached-dependency.patch @@ -0,0 +1,29 @@ +From 37e6c4120d18c11e20261f3050399267f927fe00 Mon Sep 17 00:00:00 2001 +From: Teresa Ho +Date: Mon, 17 Jul 2023 17:57:38 -0400 +Subject: [PATCH 2/2] Remove memcached dependency + +Signed-off-by: Teresa Ho +Signed-off-by: Fabiano Correa Mercer +--- + metadata.json | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/metadata.json b/metadata.json +index 4f3d431..d0c7643 100644 +--- a/metadata.json ++++ b/metadata.json +@@ -9,10 +9,6 @@ + "name": "puppetlabs/stdlib", + "version_requirement": ">=5.0.0 <7.0.0" + }, +- { +- "name": "saz/memcached", +- "version_requirement": ">=2.0.2 <3.5.0" +- }, + { + "name": "openstack/openstacklib", + "version_requirement": ">=17.4.0 <18.0.0" +-- +2.25.1 + diff --git a/config/puppet-modules/openstack/puppet-horizon-17.4.0/debian/patches/series b/config/puppet-modules/openstack/puppet-horizon-17.4.0/debian/patches/series index df9ef9d4c..28edb051c 100644 --- a/config/puppet-modules/openstack/puppet-horizon-17.4.0/debian/patches/series +++ b/config/puppet-modules/openstack/puppet-horizon-17.4.0/debian/patches/series @@ -1 +1,2 @@ 0001-Fix-exceptions-import-issue.patch +0002-Remove-memcached-dependency.patch diff --git a/config/puppet-modules/puppet-memcached/debian/deb_folder/changelog b/config/puppet-modules/puppet-memcached/debian/deb_folder/changelog new file mode 100644 index 000000000..c07be0fe6 --- /dev/null +++ b/config/puppet-modules/puppet-memcached/debian/deb_folder/changelog @@ -0,0 +1,5 @@ +puppet-memcached (8.2.0-0) unstable; urgency=medium + + * Initial release + + -- Fabiano Mercer Mon, 01 Jul 2023 11:50:43 +0000 diff --git a/config/puppet-modules/puppet-memcached/debian/deb_folder/control b/config/puppet-modules/puppet-memcached/debian/deb_folder/control new file mode 100644 index 000000000..091fef176 --- /dev/null +++ b/config/puppet-modules/puppet-memcached/debian/deb_folder/control @@ -0,0 +1,13 @@ +Source: puppet-memcached +Section: admin +Priority: optional +Maintainer: StarlingX Developers +Build-Depends: debhelper-compat (= 13) +Standards-Version: 4.4.1 +Homepage: https://www.starlingx.io + +Package: puppet-memcached +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, puppet +Description: Puppet module named puppet-memcached + This module will manage the memcached via puppet diff --git a/config/puppet-modules/puppet-memcached/debian/deb_folder/copyright b/config/puppet-modules/puppet-memcached/debian/deb_folder/copyright new file mode 100644 index 000000000..0b5b0a9cd --- /dev/null +++ b/config/puppet-modules/puppet-memcached/debian/deb_folder/copyright @@ -0,0 +1,31 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ + +Upstream-Name: puppet-memcached +Upstream-Contact: https://github.com/saz +Source: https://github.com/saz/puppet-memcached +Files: * +Copyright: (C) 2011-2016 https://github.com/saz +License: Apache-2.0 + +Upstream-Name: puppet-memcached +Upstream-Contact: StarlingX Developers +Source: https://opendev.org/starlingx/integ/src/branch/master/config/puppet-modules/puppet-memcached +Files: debian/* +Copyright: (c) 2023 Wind River Systems, Inc. +License: Apache-2.0 + +License: Apache-2.0 + 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 systems, the complete text of the Apache License Version 2.0 + can be found in `/usr/share/common-licenses/Apache-2.0'. diff --git a/config/puppet-modules/puppet-memcached/debian/deb_folder/puppet-memcached.install b/config/puppet-modules/puppet-memcached/debian/deb_folder/puppet-memcached.install new file mode 100644 index 000000000..dd3ced655 --- /dev/null +++ b/config/puppet-modules/puppet-memcached/debian/deb_folder/puppet-memcached.install @@ -0,0 +1,6 @@ +lib usr/share/puppet/modules.available/puppet-memcached +LICENSE usr/share/puppet/modules.available/puppet-memcached +manifests usr/share/puppet/modules.available/puppet-memcached +metadata.json usr/share/puppet/modules.available/puppet-memcached +spec usr/share/puppet/modules.available/puppet-memcached +templates usr/share/puppet/modules.available/puppet-memcached diff --git a/config/puppet-modules/puppet-memcached/debian/deb_folder/puppet-memcached.postinst b/config/puppet-modules/puppet-memcached/debian/deb_folder/puppet-memcached.postinst new file mode 100644 index 000000000..fa9b9baac --- /dev/null +++ b/config/puppet-modules/puppet-memcached/debian/deb_folder/puppet-memcached.postinst @@ -0,0 +1,13 @@ +#!/bin/sh +# see: dh_installdeb(1) + +set -e + +if [ "${1}" = "configure" ] ; then + update-alternatives --install /usr/share/puppet/modules/memcached puppet-module-memcached \ + /usr/share/puppet/modules.available/puppet-memcached 500 +fi + +#DEBHELPER# + +exit 0 diff --git a/config/puppet-modules/puppet-memcached/debian/deb_folder/puppet-memcached.postrm b/config/puppet-modules/puppet-memcached/debian/deb_folder/puppet-memcached.postrm new file mode 100644 index 000000000..6844e5910 --- /dev/null +++ b/config/puppet-modules/puppet-memcached/debian/deb_folder/puppet-memcached.postrm @@ -0,0 +1,13 @@ +#!/bin/sh +# see: dh_installdeb(1) + +set -e + +if [ "${1}" = "remove" ] || [ "${1}" = "disappear" ]; then + update-alternatives --remove puppet-module-memcached \ + /usr/share/puppet/modules.available/puppet-memcached +fi + +#DEBHELPER# + +exit 0 diff --git a/config/puppet-modules/puppet-memcached/debian/deb_folder/puppet-memcached.prerm b/config/puppet-modules/puppet-memcached/debian/deb_folder/puppet-memcached.prerm new file mode 100644 index 000000000..1138b5ca1 --- /dev/null +++ b/config/puppet-modules/puppet-memcached/debian/deb_folder/puppet-memcached.prerm @@ -0,0 +1,13 @@ +#!/bin/sh +# see: dh_installdeb(1) + +set -e + +if [ "${1}" = "remove" ] || [ "${1}" = "upgrade" || [ "${1}" = "deconfigure" ]; then + update-alternatives --remove puppet-module-memcached \ + /usr/share/puppet/modules.available/puppet-memcached +fi + +#DEBHELPER# + +exit 0 diff --git a/config/puppet-modules/puppet-memcached/debian/deb_folder/rules b/config/puppet-modules/puppet-memcached/debian/deb_folder/rules new file mode 100755 index 000000000..f00dbc24f --- /dev/null +++ b/config/puppet-modules/puppet-memcached/debian/deb_folder/rules @@ -0,0 +1,7 @@ +#!/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-memcached/debian/deb_folder/source/format b/config/puppet-modules/puppet-memcached/debian/deb_folder/source/format new file mode 100644 index 000000000..163aaf8d8 --- /dev/null +++ b/config/puppet-modules/puppet-memcached/debian/deb_folder/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/config/puppet-modules/puppet-memcached/debian/meta_data.yaml b/config/puppet-modules/puppet-memcached/debian/meta_data.yaml new file mode 100644 index 000000000..196051994 --- /dev/null +++ b/config/puppet-modules/puppet-memcached/debian/meta_data.yaml @@ -0,0 +1,11 @@ +--- +debname: puppet-memcached +debver: 8.2.0-0 +dl_path: + name: puppet-memcached-8.2.0-0.tar.gz + url: https://github.com/saz/puppet-memcached/archive/refs/tags/v8.2.0.tar.gz + md5sum: 2aaac58bf4b621588884d4fbdffcfff9 + sha256sum: 9d2e5910e9353fe887a13abe59b0b11464464c6317ef068b652996d39c75e692 +revision: + dist: ${STX_DIST} + PKG_GITREVCOUNT: true diff --git a/debian_iso_image.inc b/debian_iso_image.inc index 92474c597..09b357f1c 100644 --- a/debian_iso_image.inc +++ b/debian_iso_image.inc @@ -302,6 +302,9 @@ puppet-drbd #puppet-hash2stuff puppet-hash2stuff +#puppet-memcached +puppet-memcached + #puppet-etcd-1.12.3 puppet-module-cristifalcas-etcd diff --git a/debian_pkg_dirs b/debian_pkg_dirs index e4be48190..d7851b8f2 100644 --- a/debian_pkg_dirs +++ b/debian_pkg_dirs @@ -34,6 +34,7 @@ config/puppet-modules/puppetlabs-stdlib-5.0.0 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-network config/puppet-modules/puppet-puppi config/puppet-modules/puppet-rabbitmq-8.5.0