From 16f1acb9c295bab74f8e0f92270bc1643a3056a9 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Thu, 22 Apr 2021 21:35:49 +0900 Subject: [PATCH] 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. 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) --- Puppetfile_extras | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Puppetfile_extras b/Puppetfile_extras index 1dbd1c739..a15cea909 100644 --- a/Puppetfile_extras +++ b/Puppetfile_extras @@ -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',