meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppetlabs-haproxy/0001-Roll-up-TIS-patches.patch

   1 From 4485b6cbf5a8bf1d3830b0406685aba3ece4e413 Mon Sep 17 00:00:00 2001
   2 From: Don Penney <don.penney@windriver.com>
   3 Date: Wed, 11 Jan 2017 13:05:12 -0500
   4 Subject: [PATCH] Roll up TIS patches
   5
   6 ---
   7  manifests/config.pp | 4 ++--
   8  manifests/init.pp   | 4 ++--
   9  2 files changed, 4 insertions(+), 4 deletions(-)
  10
  11 diff --git a/manifests/config.pp b/manifests/config.pp
  12 index 51c2741..4007bb8 100644
  13 --- a/manifests/config.pp
  14 +++ b/manifests/config.pp
  15 @@ -75,8 +75,8 @@ define haproxy::config (
  16    if $_global_options['chroot'] {
  17      file { $_global_options['chroot']:
  18        ensure => directory,
  19 -      owner  => $_global_options['user'],
  20 -      group  => $_global_options['group'],
  21 +      owner  => 'root',
  22 +      group  => 'root',
  23      }
  24    }
  25  }
  26 diff --git a/manifests/init.pp b/manifests/init.pp
  27 index f1109d0..54a1640 100644
  28 --- a/manifests/init.pp
  29 +++ b/manifests/init.pp
  30 @@ -110,8 +110,8 @@
  31  class haproxy (
  32    $package_ensure      = 'present',
  33    $package_name        = $haproxy::params::package_name,
  34 -  $service_ensure      = 'running',
  35 -  $service_manage      = true,
  36 +  $service_ensure    = false,
  37 +  $service_manage    = false,
  38    $service_options     = $haproxy::params::service_options,
  39    $sysconfig_options   = $haproxy::params::sysconfig_options,
  40    $global_options      = $haproxy::params::global_options,
  41 --
  42 2.7.4
  43