meta-stx: re-name and re-org to align with upstream

[pti/rtp.git] / meta-stx / recipes-support / puppet / files / puppet-drbd / 0007-Add-disk-by-path-test.patch

diff --git a/meta-stx/recipes-support/puppet/files/puppet-drbd/0007-Add-disk-by-path-test.patch b/meta-stx/recipes-support/puppet/files/puppet-drbd/0007-Add-disk-by-path-test.patch
deleted file mode 100644 (file)
index 1eb12f5..0000000
--- a/meta-stx/recipes-support/puppet/files/puppet-drbd/0007-Add-disk-by-path-test.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-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
-