From 4207b92dfadff710ffce267c26b77d8268b2bb81 Mon Sep 17 00:00:00 2001 From: Dan Voiculeasa Date: Thu, 28 Apr 2022 14:44:39 +0300 Subject: [PATCH] debian: Use default ordering for Puppet Integration for AIO-SX is reaching final stages. We've used a workaround that removes the ordering setting for about 2 months now. [1] There is a puppet warning raised when configuring ordering. Using title-hash ordering we see errors, using default ordering(manifest), there are no errors. Remove ordering configuration. Tests: PASS: build-pkgs, build-image, install, check puppet.conf PASS: bootstrap PASS: unlock [1]: https://opendev.org/starlingx/utilities/src/commit/ 7ad712b168691c8172d6baffdd9a21eccad7cda4/tools/debian-integration/ source-debian/before_bootstrap_workarounds.sh [2]: https://puppet.com/docs/puppet/5.5/configuration.html#ordering Story: 2009964 Task: 45206 Signed-off-by: Dan Voiculeasa Change-Id: I3025139d79959fdd0dac591bcb4087a12ce9646b --- .../deb_patches/0003-Remove-ordering.patch | 42 +++++++++++++++++++ .../puppet-5.5.22/debian/deb_patches/series | 1 + 2 files changed, 43 insertions(+) create mode 100644 config/puppet-5.5.22/debian/deb_patches/0003-Remove-ordering.patch diff --git a/config/puppet-5.5.22/debian/deb_patches/0003-Remove-ordering.patch b/config/puppet-5.5.22/debian/deb_patches/0003-Remove-ordering.patch new file mode 100644 index 000000000..4edeba285 --- /dev/null +++ b/config/puppet-5.5.22/debian/deb_patches/0003-Remove-ordering.patch @@ -0,0 +1,42 @@ +From 6fedd90fceebb64a8af6b3e871e873058da4b816 Mon Sep 17 00:00:00 2001 +From: Dan Voiculeasa +Date: Thu, 28 Apr 2022 11:37:51 +0000 +Subject: [PATCH 3/3] Remove ordering + +Changing ordering will become obsolete in puppet 6. + +Using title-hashing ordering, we see a puppet warning and 2 errors. +- Warning: 2022-04-27 11:26:13 +0000 Setting ordering is deprecated. +- drbdadm create-md drbd-pgsql -W--peer-max-bio-size=128k' returned 1 +instead of one of [0] +- Could not prefetch keystone_role provider 'openstack' + +Use default ordering. + +[1]: https://puppet.com/docs/puppet/5.5/configuration.html#ordering + +Signed-off-by: Dan Voiculeasa +--- + debian/conffiles/puppet.conf | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/debian/conffiles/puppet.conf b/debian/conffiles/puppet.conf +index a90f481..db0234d 100644 +--- a/debian/conffiles/puppet.conf ++++ b/debian/conffiles/puppet.conf +@@ -4,10 +4,11 @@ + # - https://puppet.com/docs/puppet/latest/config_about_settings.html + # - https://puppet.com/docs/puppet/latest/config_file_main.html + # - https://puppet.com/docs/puppet/latest/configuration.html ++# Ordering is deprecated. ++# - https://puppet.com/docs/puppet/5.5/configuration.html#ordering + [main] + # Prevent the use of undefined variables + strict_variables = true +-ordering = title-hash + + # Set the path to StarlingX puppet modules + basemodulepath = /usr/share/puppet/modules:/usr/share/openstack-puppet/modules +-- +2.30.2 + diff --git a/config/puppet-5.5.22/debian/deb_patches/series b/config/puppet-5.5.22/debian/deb_patches/series index ae1a6f03d..256d47b6b 100644 --- a/config/puppet-5.5.22/debian/deb_patches/series +++ b/config/puppet-5.5.22/debian/deb_patches/series @@ -1,2 +1,3 @@ 0001-Remove-default-hiera-config.patch 0002-debian-Correctly-install-the-StarlingX-puppet.conf.patch +0003-Remove-ordering.patch