[node-patches] Change in ovirt-node[master]: add _functions. to necessary is_iscsi_install calls

[jboggs at redhat.com]

Joey Boggs has uploaded a new change for review.

Change subject: add _functions. to necessary is_iscsi_install calls
......................................................................

add _functions. to necessary is_iscsi_install calls

Change-Id: Ie98248002030e025e93421302f2509f1db58ef76
Signed-off-by: Joey Boggs <jboggs at redhat.com>
---
M scripts/ovirtnode/install.py
M scripts/ovirtnode/storage.py
2 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/15/8615/1

diff --git a/scripts/ovirtnode/install.py b/scripts/ovirtnode/install.py
index ae369a7..e9e4ebf 100755
--- a/scripts/ovirtnode/install.py
+++ b/scripts/ovirtnode/install.py
@@ -93,7 +93,7 @@
                 _functions.mount_efi()
 
     def grub_install(self):
-        if is_iscsi_install():
+        if _functions.is_iscsi_install():
             self.disk = re.sub("p[1,2,3]$", "", findfs(self.boot_candidate))
         device_map = "(hd0) %s" % self.disk
         logger.debug(device_map)
diff --git a/scripts/ovirtnode/storage.py b/scripts/ovirtnode/storage.py
index 67d40aa..b83514c 100644
--- a/scripts/ovirtnode/storage.py
+++ b/scripts/ovirtnode/storage.py
@@ -360,7 +360,7 @@
         for drv in self.HOSTVGDRIVE.strip(",").split(","):
             drv = _functions.translate_multipath_device(drv)
             if drv != "":
-                if self.ROOTDRIVE == drv and not is_iscsi_install():
+                if self.ROOTDRIVE == drv and not _functions.is_iscsi_install():
                     self.reread_partitions(self.ROOTDRIVE)
                     parted_cmd = ("parted \"" + drv + "\" -s \"mkpart " +
                                   "primary ext2 " + str(self.RootBackup_end) +
@@ -740,7 +740,7 @@
 
         if ("OVIRT_ROOT_INSTALL" in _functions.OVIRT_VARS and
                   _functions.OVIRT_VARS["OVIRT_ROOT_INSTALL"] == "y" and not \
-                      is_iscsi_install()):
+                      _functions.is_iscsi_install()):
             logger.info("Partitioning root drive: " + self.ROOTDRIVE)
             _functions.wipe_partitions(self.ROOTDRIVE)
             self.reread_partitions(self.ROOTDRIVE)


--
To view, visit http://gerrit.ovirt.org/8615
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie98248002030e025e93421302f2509f1db58ef76
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Joey Boggs <jboggs at redhat.com>