stable-only: Pin puppetlabs-haproxy
The puppetlabs-haproxy repo no longer has the master branch and the master branch has been replaced by the main branch. While we switched the branch in use in master[1], for stable branches it is better to pin it to a specific version to avoid issue caused by any future change in puppetlabs-haproxy. The version is determined based on the version currently provided in RDO. Note for Train backport: Resolved conflict caused by the following train-only patch.45b91c3f09
Conflicts: Puppetfile_extras [1] https://review.opendev.org/c/openstack/puppet-tripleo/+/786018/4/Puppetfile_extras Change-Id: I5d1d891474e4d7b47f497c5bd0144ce24e291260 (cherry picked from commitf6852abbfb
) (cherry picked from commit379895e743
)
This commit is contained in:
parent
d6643e507b
commit
16f1acb9c2
@ -3,7 +3,7 @@
|
||||
|
||||
mod 'haproxy',
|
||||
:git => 'https://github.com/puppetlabs/puppetlabs-haproxy',
|
||||
:ref => 'df96ffc5276ee316be925f9423612e9190055d8f'
|
||||
:ref => 'v4.1.0'
|
||||
|
||||
mod 'tomcat',
|
||||
:git => 'https://github.com/puppetlabs/puppetlabs-tomcat',
|
||||
|
Loading…
Reference in New Issue
Block a user