[node-patches] Change in ovirt-node[master]: installer: block on invalid hostvg 'other_device'

[jboggs at redhat.com]

Joey Boggs has uploaded a new change for review.

Change subject: installer: block on invalid hostvg 'other_device'
......................................................................

installer: block on invalid hostvg 'other_device'

rhbz#856171

Change-Id: Ie15884f46f7b5dc2ad0b64ff18c202bae9a9a056
Signed-off-by: Joey Boggs <jboggs at redhat.com>
---
M scripts/ovirt-config-installer.py
1 file changed, 15 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/07/8107/1

diff --git a/scripts/ovirt-config-installer.py b/scripts/ovirt-config-installer.py
index 9cad91a..5d02f3a 100644
--- a/scripts/ovirt-config-installer.py
+++ b/scripts/ovirt-config-installer.py
@@ -263,10 +263,10 @@
                 self.screen.setColor("BUTTON", "black", "red")
                 self.screen.setColor("ACTBUTTON", "blue", "white")
                 ButtonChoiceWindow(self.screen, "Storage Check", "Invalid Block Device: " + dev, buttons = ['Ok'])
-            self.reset_screen_colors()
-            self.failed_block_dev = 1
-        else:
-            self.failed_block_dev = 0
+                self.reset_screen_colors()
+                self.failed_block_dev = 1
+            else:
+                self.failed_block_dev = 0
         return
 
     def menuSpacing(self):
@@ -882,14 +882,17 @@
                         if not self.hostvg_device.value():
                             ButtonChoiceWindow(self.screen, "HostVG Storage Selection", "You must enter a valid device", buttons = ['Ok'])
                         else:
-                            self.hostvg_init = translate_multipath_device(self.hostvg_device.value())
-                            hostvg_list = ""
-                            for dev in self.hostvg_init.split(","):
-                                if not tui_check_fakeraid(dev, self.screen):
-                                    continue
-                                hostvg_list += dev + ","
-                            augtool("set", "/files/" + OVIRT_DEFAULTS + "/OVIRT_INIT", '"' + self.storage_init + "," + hostvg_list + '"')
-                            self.__current_page = PASSWORD_PAGE
+                            if self.failed_block_dev == 0:
+                                self.hostvg_init = translate_multipath_device(self.hostvg_device.value())
+                                hostvg_list = ""
+                                for dev in self.hostvg_init.split(","):
+                                    if not tui_check_fakeraid(dev, self.screen):
+                                        continue
+                                    hostvg_list += dev + ","
+                                augtool("set", "/files/" + OVIRT_DEFAULTS + "/OVIRT_INIT", '"' + self.storage_init + "," + hostvg_list + '"')
+                                self.__current_page = PASSWORD_PAGE
+                            else:
+                                self.__current_page = OTHER_DEVICE_HOSTVG_PAGE
                     elif self.__current_page == UPGRADE_PAGE:
                         if self.current_password_fail is not 1:
                             if self.valid_password == 0:


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

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