e51a4a5bbe
This change can fix the issue during package upgrade that causes config_controller failed at step 6. Root cause is that package update introduced a warning output in frontend.pp file which will cause puppet-manifest-apply failure as it do not allow any warning existed in puppet log. Story: 2003389 Task: 24504 Depends-On: https://review.openstack.org/#/c/600359/ Change-Id: Iabfa73e80859feeccbc1e6c81032169f94812013 Signed-off-by: zhipengl <zhipengs.liu@intel.com>
44 lines
1.3 KiB
Diff
44 lines
1.3 KiB
Diff
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
|
|
|