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>
1d31c4dd06