From 4331caeb249aa4013f62602fcc0e2c5296d6eb42 Mon Sep 17 00:00:00 2001
From: Trey Palmer <tpalmer@rsglab.com>
Date: Fri, 24 Jun 2016 11:27:15 -0400
Subject: [PATCH] Allow /dev devices for NVMe SSD's and vagrant disks

---
 README.md                            | 8 ++++++++
 lib/puppet/provider/osd/ceph_disk.rb | 6 ++++--
 lib/puppet/type/osd.rb               | 2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index d2e3b12..eb0d81e 100644
--- a/README.md
+++ b/README.md
@@ -37,6 +37,14 @@ can be provisioned with 'Slot 01/Slot 12' which directly correlates with slot na
 found in sysfs.  The two addressing modes can be used interchangably thus
 configuration like 'Slot 01/2:0:0:0' is permissible.
 
+Finally, /dev device names can be used when needed, though they should
+not be used for physical SATA/SAS disks running on metal.  This handles
+problems such as NVMe PCIe SSD's (which do not have SCSI addresses)
+and differences in assigned disk SCSI addresses between vagrant providers.
+Thus a physical disk with an NVMe journal can be provisioned with
+'0:0:0:1/nvme0n1', and a vagrant second disk can be 'sdb/sdb' to ensure
+it would work in either VirtualBox or VMware.
+
 ## Setup
 
 ### Setup Requirements
diff --git a/lib/puppet/provider/osd/ceph_disk.rb b/lib/puppet/provider/osd/ceph_disk.rb
index f9255c8..435c796 100755
--- a/lib/puppet/provider/osd/ceph_disk.rb
+++ b/lib/puppet/provider/osd/ceph_disk.rb
@@ -35,12 +35,14 @@ def enclosure_slot_to_dev(slot)
 
   # Redirect the request to the correct SCSI backend
   # Params:
-  # +indetifier+:: SCSI address or enclosure slot number
+  # +identifier+:: SCSI address, enclosure slot number, or /dev device name
   def identifier_to_dev(identifier)
     if identifier.start_with?('Slot')
       enclosure_slot_to_dev(identifier)
-    else
+    elsif identifier =~ /^\d+:\d+:\d+:\d+/
       scsi_address_to_dev(identifier)
+    else
+      identifier
     end
   end
 
diff --git a/lib/puppet/type/osd.rb b/lib/puppet/type/osd.rb
index 2823b5e..7a3bf3c 100755
--- a/lib/puppet/type/osd.rb
+++ b/lib/puppet/type/osd.rb
@@ -21,7 +21,7 @@
   newparam(:name) do
     desc 'OSD and journal SCSI addresses which can be specified as "H:B:T:L" for direct attached or "Slot 01" for expander devices'
     validate do |value|
-      unless value =~ /^(\d+:\d+:\d+:\d+|Slot \d{2})\/(\d+:\d+:\d+:\d+|Slot \d{2})$/
+      unless value =~ /^(\d+:\d+:\d+:\d+|Slot \d{2}|sd[a-z]+|nvme)\/(\d+:\d+:\d+:\d+|Slot \d{2}|sd[a-z]+|nvme.+)$/
         raise ArgumentError, 'osd::name invalid'
       end
     end