integ/config/puppet-modules/puppet-drbd-0.3.1/centos/files/0008-CGTS-7953-support-for-new-drbd-resources.patch
Scott Little bab9bb6b69 Internal restructuring of stx-integ
Create new directories:
   ceph
   config
   config-files
   filesystem
   kernel
   kernel/kernel-modules
   ldap
   logging
   strorage-drivers
   tools
   utilities
   virt

Retire directories:
   connectivity
   core
   devtools
   support
   extended

Delete two packages:
   tgt
   irqbalance

Relocated packages:
   base/
      dhcp
      initscripts
      libevent
      lighttpd
      linuxptp
      memcached
      net-snmp
      novnc
      ntp
      openssh
      pam
      procps
      sanlock
      shadow
      sudo
      systemd
      util-linux
      vim
      watchdog

   ceph/
      python-cephclient

   config/
      facter
      puppet-4.8.2
      puppet-modules

   filesystem/
      e2fsprogs
      nfs-utils
      nfscheck

   kernel/
      kernel-std
      kernel-rt

   kernel/kernel-modules/
      mlnx-ofa_kernel

   ldap/
      nss-pam-ldapd
      openldap

   logging/
      syslog-ng
      logrotate

   networking/
      lldpd
      iproute
      mellanox
      python-ryu
      mlx4-config

   python/
      python-2.7.5
      python-django
      python-gunicorn
      python-setuptools
      python-smartpm
      python-voluptuous

   security/
      shim-signed
      shim-unsigned
      tboot

   strorage-drivers/
      python-3parclient
      python-lefthandclient

   virt/
      cloud-init
      libvirt
      libvirt-python
      qemu

   tools/
      storage-topology
      vm-topology

   utilities/
      tis-extensions
      namespace-utils
      nova-utils
      update-motd

Change-Id: I37ade764d873c701b35eac5881eb40412ba64a86
Story: 2002801
Task: 22687
Signed-off-by: Scott Little <scott.little@windriver.com>
2018-08-01 10:06:31 -04:00

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