openstack/puppet-tripleo
Code Issues Proposed changes

stable-only: Pin puppetlabs-haproxy

Browse Source 
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.
        45b91c3f09b20dcdbf685ff265919a7a8906698d

Conflicts:
	Puppetfile_extras

[1] https://review.opendev.org/c/openstack/puppet-tripleo/+/786018/4/Puppetfile_extras
Change-Id: I5d1d891474e4d7b47f497c5bd0144ce24e291260
(cherry picked from commit f6852abbfb8caa2aa6376074b4ddf91c35b396f9)
(cherry picked from commit 379895e743f647839847a7f6968385f7e01a3613)
This commit is contained in:
Takashi Kajinami 2021-04-22 21:35:49 +09:00
parent d6643e507b
commit 16f1acb9c2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Puppetfile_extras
View File

@ -3,7 +3,7 @@
mod 'haproxy', mod 'haproxy',
:git => 'https://github.com/puppetlabs/puppetlabs-haproxy', :git => 'https://github.com/puppetlabs/puppetlabs-haproxy',
:ref => 'df96ffc5276ee316be925f9423612e9190055d8f' :ref => 'v4.1.0'
mod 'tomcat', mod 'tomcat',
:git => 'https://github.com/puppetlabs/puppetlabs-tomcat', :git => 'https://github.com/puppetlabs/puppetlabs-tomcat',