f66ba24e4e
Added packaging support for Trixie under 'debian/trixie/'. This change brings updates from the 'f/trixie' branch into 'master' to ensure consistent functionality and packaging structure across both branches. facter puppet-ceph puppet-keystone puppet-horizon puppet-openstacklib puppet-oslo puppet-boolean puppet-dnsmasq puppet-drbd puppet-etcd puppetlabs-haproxy puppetlabs-postgresql puppetlabs-stdlib puppet-hash2stuff puppet-lvm puppet-memcached puppet-network puppet-puppi puppet-rabbitmq puppet-staging puppet-vswitch puppet-zitrlp-strongswan Story: 2011360 Task: 53245 Change-Id: Id877ddc73835f0c3adeaae3a304dc5eb6f1c8274 Signed-off-by: pmp1 <preetham.mp@windriver.com> Signed-off-by: Abhinav Ayyapasetti <ayyapasetti.abhinav@windriver.com>
41 lines
1011 B
Diff
41 lines
1011 B
Diff
From a29598365183c10e4650088675a6e3181b340187 Mon Sep 17 00:00:00 2001
|
|
From: Kristine Bujold <kristine.bujold@windriver.com>
|
|
Date: Wed, 17 Jan 2018 18:18:15 -0500
|
|
Subject: [PATCH 1/1] foo bar
|
|
|
|
---
|
|
manifests/init.pp | 2 ++
|
|
templates/global_common.conf.erb | 5 +++++
|
|
2 files changed, 7 insertions(+)
|
|
|
|
diff --git a/manifests/init.pp b/manifests/init.pp
|
|
index 76ce9c9..5e6bdc0 100644
|
|
--- a/manifests/init.pp
|
|
+++ b/manifests/init.pp
|
|
@@ -8,6 +8,8 @@ class drbd(
|
|
$service_enable = true,
|
|
$service_ensure = 'running',
|
|
$package_name = 'drbd-utils',
|
|
+ $wfc_timeout = 0,
|
|
+ $degr_wfc_timeout = 0,
|
|
) {
|
|
include ::drbd::service
|
|
|
|
diff --git a/templates/global_common.conf.erb b/templates/global_common.conf.erb
|
|
index 921a637..0253ef3 100644
|
|
--- a/templates/global_common.conf.erb
|
|
+++ b/templates/global_common.conf.erb
|
|
@@ -3,4 +3,9 @@ global {
|
|
}
|
|
common {
|
|
protocol C;
|
|
+
|
|
+ startup {
|
|
+ wfc-timeout <%= @wfc_timeout %>;
|
|
+ degr-wfc-timeout <%= @degr_wfc_timeout %>;
|
|
+ }
|
|
}
|
|
--
|
|
1.8.3.1
|
|
|