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>
52 lines
1.5 KiB
Diff
52 lines
1.5 KiB
Diff
From 30ae8c86d9471980a0058823d6593e7548e19506 Mon Sep 17 00:00:00 2001
|
|
From: Don Penney <don.penney@windriver.com>
|
|
Date: Thu, 15 Jun 2017 17:34:30 -0400
|
|
Subject: [PATCH] Add disk by-path test
|
|
|
|
---
|
|
manifests/resource/up.pp | 14 +++++++++++++-
|
|
1 file changed, 13 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/manifests/resource/up.pp b/manifests/resource/up.pp
|
|
index 3e2fdac..ea379a8 100644
|
|
--- a/manifests/resource/up.pp
|
|
+++ b/manifests/resource/up.pp
|
|
@@ -8,6 +8,17 @@ define drbd::resource::up (
|
|
$mountpoint,
|
|
$automount,
|
|
) {
|
|
+
|
|
+ # Ensure disk by-path link exists
|
|
+ exec { "test disk by-path for ${name}":
|
|
+ command => "udevadm settle",
|
|
+ unless => "test -e ${disk}",
|
|
+ before => Service['drbd'],
|
|
+ require => [
|
|
+ Exec['modprobe drbd']
|
|
+ ],
|
|
+ }
|
|
+
|
|
# create metadata on device, except if resource seems already initalized.
|
|
# drbd is very tenacious about asking for aproval if there is data on the
|
|
# volume already.
|
|
@@ -18,6 +29,7 @@ define drbd::resource::up (
|
|
before => Service['drbd'],
|
|
require => [
|
|
Exec['modprobe drbd'],
|
|
+ Exec["test disk by-path for ${name}"],
|
|
Concat["/etc/drbd.d/${name}.res"],
|
|
],
|
|
notify => Service['drbd'],
|
|
@@ -35,7 +47,7 @@ define drbd::resource::up (
|
|
notify => Service['drbd'],
|
|
}
|
|
|
|
- exec { "reuse existing DRBD resoure ${name}":
|
|
+ exec { "reuse existing DRBD resource ${name}":
|
|
command => "drbdadm adjust ${name}",
|
|
onlyif => "test -e ${disk} && (drbdadm show-gi ${name} | grep 'meta-data: need apply-al')",
|
|
before => Service['drbd'],
|
|
--
|
|
1.8.3.1
|
|
|