integ/series at ea1d81735d0f833817e6829349b139f348a5ed39 - integ - OpenDev: Free Software Needs Free Tools

starlingx/integ

Robert Church 1d31c4dd06 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, 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>

2022-02-22 20:56:18 -05:00

3 lines

101 B

Plaintext

Raw Blame History

	`0001-Remove-default-hiera-config.patch`
	`0002-debian-Correctly-install-the-StarlingX-puppet.conf.patch`