Add initial meta-stx to support StarlingX build

[pti/rtp.git] / meta-stx / recipes-support / puppet / files / puppetlabs-haproxy / 0004-Stop-invalid-warning-message

diff --git a/meta-stx/recipes-support/puppet/files/puppetlabs-haproxy/0004-Stop-invalid-warning-message b/meta-stx/recipes-support/puppet/files/puppetlabs-haproxy/0004-Stop-invalid-warning-message
new file mode 100644 (file)
index 0000000..44c9b52
--- /dev/null
+++ b/meta-stx/recipes-support/puppet/files/puppetlabs-haproxy/0004-Stop-invalid-warning-message
@@ -0,0 +1,31 @@
+From 7e1cff1503d9980e6fa346ec0e9cb93dc69774bf Mon Sep 17 00:00:00 2001
+From: zhipengl <zhipengs.liu@intel.com>
+Date: Fri, 7 Sep 2018 19:24:01 +0800
+Subject: [PATCH] Stop-invalid-warning-message.patch
+
+It can fix config_controller failure at step 6.
+
+The upstream fix is at below link
+https://github.com/puppetlabs/puppetlabs-haproxy/commit/20db4474c5938c21ac441f0092254c78b5978cc4
+
+Signed-off-by: zhipengl <zhipengs.liu@intel.com>
+---
+ manifests/frontend.pp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/manifests/frontend.pp b/manifests/frontend.pp
+index 1623115..709a08c 100644
+--- a/manifests/frontend.pp
++++ b/manifests/frontend.pp
+@@ -102,7 +102,7 @@ define haproxy::frontend (
+   $defaults_use_backend    = true,
+   $config_file             = undef,
+   # Deprecated
+-  $bind_options            = undef,
++  $bind_options            = '',
+ ) {
+   if $ports and $bind {
+     fail('The use of $ports and $bind is mutually exclusive, please choose either one')
+-- 
+2.7.4
+