From be671a46426fb214cccfd1b0d7dd5e97f04a317d Mon Sep 17 00:00:00 2001
From: Ryan Moe <rmoe@mirantis.com>
Date: Mon, 23 Mar 2015 16:23:24 -0700
Subject: [PATCH] Add support for nvme devices to pmanager

nvme devices show up as e.g. nvme0n1p3. _pseparator needs
to return a 'p' separator for these devices.

Change-Id: Id2ebcaa5b1332c0e00c54440ee19e6c0cb859e00
Closes-bug: #1372547
---
 .../cobbler/templates/scripts/pmanager.py     | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/deployment/puppet/cobbler/templates/scripts/pmanager.py b/deployment/puppet/cobbler/templates/scripts/pmanager.py
index b77cac5cc8..b87d85e126 100644
--- a/deployment/puppet/cobbler/templates/scripts/pmanager.py
+++ b/deployment/puppet/cobbler/templates/scripts/pmanager.py
@@ -29,7 +29,7 @@ class PManager(object):
 
     def _pseparator(self, devname):
         pseparator = ''
-        if devname.find('cciss') >= 0:
+        if 'cciss' in devname or 'nvme' in devname:
             pseparator = 'p'
         return pseparator
 
@@ -284,7 +284,7 @@ class PManager(object):
                               "--onpart={2}"
                               "{3}{4}".format(part["mount"], size,
                                               self._disk_dev(disk),
-                                              self._pseparator(disk["id"]),
+                                              self._pseparator(disk['name']),
                                               pcount))
 
                 else:
@@ -295,7 +295,7 @@ class PManager(object):
                                       tabfstype,
                                       tabfsoptions,
                                       self._disk_dev(disk),
-                                      self._pseparator(disk["id"]),
+                                      self._pseparator(disk['name']),
                                       pcount, disk_label))
                         if part["mount"] != "none":
                             self.post("mkdir -p /mnt/sysimage{0}".format(
@@ -307,7 +307,7 @@ class PManager(object):
                                   "{3} {4} defaults 0 0'"
                                   " >> /mnt/sysimage/etc/fstab".format(
                                       self._disk_dev(disk),
-                                      self._pseparator(disk["id"]),
+                                      self._pseparator(disk['name']),
                                       pcount, tabmount, tabfstype))
 
     def raids(self, volume_filter=None):
@@ -328,7 +328,7 @@ class PManager(object):
                 phys[raid["mount"]].append(
                     "{0}{1}{2}".format(
                         self._disk_dev(disk),
-                        self._pseparator(disk["id"]), pcount))
+                        self._pseparator(disk['name']), pcount))
                 rname = "raid.{0:03d}".format(self.rcount(1))
                 begin_size = self.psize(disk["id"])
                 end_size = self.psize(disk["id"], raid["size"] * self.factor)
@@ -339,7 +339,7 @@ class PManager(object):
                 self.kick("partition {0} "
                           "--onpart={2}{3}{4}"
                           "".format(rname, raid["size"], self._disk_dev(disk),
-                                    self._pseparator(disk["id"]), pcount))
+                                    self._pseparator(disk['name']), pcount))
 
                 if not raids.get(raid["mount"]):
                     raids[raid["mount"]] = []
@@ -395,7 +395,7 @@ class PManager(object):
                 self.kick("partition {0} "
                           "--onpart={2}{3}{4}"
                           "".format(pvname, pv["size"], self._disk_dev(disk),
-                                    self._pseparator(disk["id"]), pcount))
+                                    self._pseparator(disk['name']), pcount))
 
                 if not pvs.get(pv["vg"]):
                     pvs[pv["vg"]] = []
@@ -595,7 +595,7 @@ class PreseedPManager(object):
 
     def _pseparator(self, devname):
         pseparator = ''
-        if devname.find('cciss') >= 0:
+        if 'cciss' in devname or 'nvme' in devname:
             pseparator = 'p'
         return pseparator
 
@@ -914,7 +914,7 @@ class PreseedPManager(object):
                 # clear any fs info that may remain on newly created partition
                 self.late("dd if=/dev/zero of={0}{1}{2} bs=1M count=10"
                           "".format(self._disk_dev(disk),
-                                    self._pseparator(disk["id"]),
+                                    self._pseparator(disk['name']),
                                     pcount))
 
                 fs = part.get("file_system", "xfs")
@@ -924,7 +924,7 @@ class PreseedPManager(object):
                         part.get("file_system", "xfs"),
                         self._fsoptions(part.get("file_system", "xfs")),
                         self._disk_dev(disk),
-                        self._pseparator(disk["id"]),
+                        self._pseparator(disk['name']),
                         pcount, disk_label))
         self._unblacklist_udev_rules()
         self._mount_target()
@@ -959,7 +959,7 @@ class PreseedPManager(object):
                               " >> /target/etc/fstab"
                               "".format(
                                   self._disk_dev(disk),
-                                  self._pseparator(disk["id"]),
+                                  self._pseparator(disk['name']),
                                   part["pcount"], tabmount,
                                   part.get("file_system", "xfs"),
                                   ("defaults" if part["mount"] != "swap"
@@ -1028,14 +1028,14 @@ class PreseedPManager(object):
                 self.late("cat /proc/partitions")
                 pvlist.append("pvcreate -ff {0}{1}{2}"
                               "".format(self._disk_dev(disk),
-                                        self._pseparator(disk["id"]),
+                                        self._pseparator(disk['name']),
                                         pcount))
                 if not devices_dict.get(pv["vg"]):
                     devices_dict[pv["vg"]] = []
                 devices_dict[pv["vg"]].append(
                     "{0}{1}{2}"
                     "".format(self._disk_dev(disk),
-                              self._pseparator(disk["id"]), pcount)
+                              self._pseparator(disk['name']), pcount)
                 )
         self._unblacklist_udev_rules()