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 <dan.voiculeasa@windriver.com>
Change-Id: I3025139d79959fdd0dac591bcb4087a12ce9646b
On Debian puppet is failing on unlock because some
services are nonexistent when puppet tries to mask them.
This commit adds a patch with the fix from puppet 6.X.
See: e42922b50e
Test Plan:
CentOS/Debian:
Pass: Build package
Pass: Build image
Pass: Controller unlocked/enabled/available
Pass: Same behaviour as before CentOS
Story: 2009965
Task: 45002
Signed-off-by: Fabricio Henrique Ramos <fabriciohenrique.ramos@windriver.com>
Change-Id: Idd10533d146ac10cda0adf9504b52f59593fb810
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>
Remove default hiera.yaml since we ship our
own hiera.yaml in puppet-manifests and it caused
conflicts when both are installed on the same system.
Story: 2009101
Task: 43247
Signed-off-by: Charles Short <charles.short@windriver.com>
Change-Id: I053f7d7bff9291a0c09539c2959a143634744401
Add debian packaging directory to build puppet 5.5.22 for starlingx.
Story: 2009101
Task: 43247
Signed-off-by: Charles Short <charles.short@windriver.com>
Change-Id: If2f36cd2781f4d1485f1b47c510f415014ad2d43