starlingx/integ
Code Issues Proposed changes

debian: Correctly install the StarlingX puppet.conf

Browse Source 
The upstream Debian package provides its own puppet.conf and hiera.yaml
files. The puppet.conf file is being installed and is overwriting the
desired patched puppet.conf file from the source patch
0005-Set-strict-variables-and-basemodulepath-in-puppet.co.patch.

Move the desired content to conffiles/puppet.conf, drop the source
patch, and allow the existing install directives to install the
StarlingX content.

This packaging should be revisited in the future to update
conffiles/hiera.yaml for what is required by StarlingX . This should
install the hiera.yaml (converted to v5) from the stx-puppet package and
drop the change from that package.

This should provide ordering compatibility between CentOS and Debian to
support dual OS development.

Test Plan:
 - Build package in Debian
 - Include package in Debian ISO
 - Install ISO and confirm contents of /etc/puppet/puppet.conf

Change-Id: Ibfc58ed64a413da5620a2f05247822ef76271ef7
Story: 2009101
Task: 44576
Signed-off-by: Robert Church <robert.church@windriver.com>
This commit is contained in:
Robert Church 2022-02-22 17:38:22 -05:00
parent 5f474f3c2e
commit 1d31c4dd06
5 changed files with 55 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config/puppet-5.5.22/debian/deb_patches/0001-Remove-default-hiera-config.patch
View File

@ -1,7 +1,7 @@
From e04e7a99a049b3dadcf7f26db8198e01d25f1d5f Mon Sep 17 00:00:00 2001
From 4cd14c94ddc02b9b3aa1f25a038db657c5f9235e Mon Sep 17 00:00:00 2001
From: Charles Short <charles.short@windriver.com>
Date: Tue, 26 Oct 2021 11:54:45 -0400
Subject: [PATCH] Remove default hiera config
Subject: [PATCH 1/2] Remove default hiera config
Remove the default puppet hiera.yaml so it wont conflict
with the hiera.yaml shipped in the puppet-manifests
@ -14,7 +14,7 @@ Signed-off-by: Charles Short <charles.short@windriver.com>
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/debian/puppet.install b/debian/puppet.install
index 323c342f83..b338ec1191 100644
index 323c342..b338ec1 100644
--- a/debian/puppet.install
+++ b/debian/puppet.install
@@ -3,5 +3,4 @@
@ -24,7 +24,7 @@ index 323c342f83..b338ec1191 100644
-debian/conffiles/hiera.yaml /etc/puppet
debian/conffiles/puppet.conf /etc/puppet
diff --git a/debian/rules b/debian/rules
index 60100a243a..c0eda262bd 100755
index 60100a2..c0eda26 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,13 +19,15 @@ override_dh_auto_install:
@ -45,5 +45,5 @@ index 60100a243a..c0eda262bd 100755
debian/puppet-master-passenger/usr/share/puppet-master-passenger/apache2.site.conf.tmpl
--
2.25.1
2.16.6

49
config/puppet-5.5.22/debian/deb_patches/0002-debian-Correctly-install-the-StarlingX-puppet.conf.patch Normal file
View File

@ -0,0 +1,49 @@
From c165f09af0e4def19b12d0028033ec16fad80d2f Mon Sep 17 00:00:00 2001
From: Robert Church <robert.church@windriver.com>
Date: Tue, 22 Feb 2022 16:05:06 -0500
Subject: [PATCH 2/2] debian: Correctly install the StarlingX puppet.conf
The upstream Debian package provides its own puppet.conf and hiera.yaml
files. The puppet.conf file is being installed and is overwriting the
desired patched puppet.conf file from the source patch
0005-Set-strict-variables-and-basemodulepath-in-puppet.co.patch.
Move the desired content to conffiles/puppet.conf and allow the existing
install directives to install the StarlingX content.
This packaging should be revisited in the future to update
conffiles/hiera.yaml for what is required by StarlingX . This should
install the hiera.yaml (converted to v5) from the stx-puppet package and
drop the change from that package.
Signed-off-by: Robert Church <robert.church@windriver.com>
---
debian/conffiles/puppet.conf | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/debian/conffiles/puppet.conf b/debian/conffiles/puppet.conf
index b50d304..a90f481 100644
--- a/debian/conffiles/puppet.conf
+++ b/debian/conffiles/puppet.conf
@@ -1,7 +1,13 @@
+# This file can be used to override the default puppet settings.
+# See the following links for more details on what settings are available:
+# - https://puppet.com/docs/puppet/latest/config_important_settings.html
+# - 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
[main]
-ssldir = /var/lib/puppet/ssl
+# Prevent the use of undefined variables
+strict_variables = true
+ordering = title-hash
-[master]
-vardir = /var/lib/puppet
-cadir = /var/lib/puppet/ssl/ca
-dns_alt_names = puppet
+# Set the path to StarlingX puppet modules
+basemodulepath = /usr/share/puppet/modules:/usr/share/openstack-puppet/modules
--
2.16.6

1
config/puppet-5.5.22/debian/deb_patches/series
View File

@ -1 +1,2 @@
0001-Remove-default-hiera-config.patch
0002-debian-Correctly-install-the-StarlingX-puppet.conf.patch

29
config/puppet-5.5.22/debian/patches/0005-Set-strict-variables-and-basemodulepath-in-puppet.co.patch
View File

@ -1,29 +0,0 @@
From ded72d71cbcdf31cad3088790195a056b57b47a2 Mon Sep 17 00:00:00 2001
From: Al Bailey <Al.Bailey@windriver.com>
Date: Tue, 10 Oct 2017 09:41:17 -0500
Subject: [PATCH 5/5] Set strict variables and basemodulepath in puppet.conf
Also sets ordering = title-hash so that puppet 4 will run the same as puppet 3
Signed-off-by: Robert Church <robert.church@windriver.com>
---
conf/puppet.conf | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/conf/puppet.conf b/conf/puppet.conf
index 67dba46..4efaf55 100644
--- a/conf/puppet.conf
+++ b/conf/puppet.conf
@@ -4,3 +4,9 @@
# - 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
+[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.16.6

1
config/puppet-5.5.22/debian/patches/series
View File

@ -2,4 +2,3 @@
0002-Set-hasstatus-to-false-by-default.patch
0003-Update-getpid-function.patch
0004-Block-enabling-of-services.patch
0005-Set-strict-variables-and-basemodulepath-in-puppet.co.patch