Add initial meta-stx to support StarlingX build

[pti/rtp.git] / meta-stx / recipes-support / puppet / files / puppetlabs-haproxy / 0001-Roll-up-TIS-patches.patch

diff --git a/meta-stx/recipes-support/puppet/files/puppetlabs-haproxy/0001-Roll-up-TIS-patches.patch b/meta-stx/recipes-support/puppet/files/puppetlabs-haproxy/0001-Roll-up-TIS-patches.patch
new file mode 100644 (file)
index 0000000..15b3575
--- /dev/null
+++ b/meta-stx/recipes-support/puppet/files/puppetlabs-haproxy/0001-Roll-up-TIS-patches.patch
@@ -0,0 +1,43 @@
+From 4485b6cbf5a8bf1d3830b0406685aba3ece4e413 Mon Sep 17 00:00:00 2001
+From: Don Penney <don.penney@windriver.com>
+Date: Wed, 11 Jan 2017 13:05:12 -0500
+Subject: [PATCH] Roll up TIS patches
+
+---
+ manifests/config.pp | 4 ++--
+ manifests/init.pp   | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/manifests/config.pp b/manifests/config.pp
+index 51c2741..4007bb8 100644
+--- a/manifests/config.pp
++++ b/manifests/config.pp
+@@ -75,8 +75,8 @@ define haproxy::config (
+   if $_global_options['chroot'] {
+     file { $_global_options['chroot']:
+       ensure => directory,
+-      owner  => $_global_options['user'],
+-      group  => $_global_options['group'],
++      owner  => 'root',
++      group  => 'root',
+     }
+   }
+ }
+diff --git a/manifests/init.pp b/manifests/init.pp
+index f1109d0..54a1640 100644
+--- a/manifests/init.pp
++++ b/manifests/init.pp
+@@ -110,8 +110,8 @@
+ class haproxy (
+   $package_ensure      = 'present',
+   $package_name        = $haproxy::params::package_name,
+-  $service_ensure      = 'running',
+-  $service_manage      = true,
++  $service_ensure    = false,
++  $service_manage    = false,
+   $service_options     = $haproxy::params::service_options,
+   $sysconfig_options   = $haproxy::params::sysconfig_options,
+   $global_options      = $haproxy::params::global_options,
+-- 
+2.7.4
+