search for: ovirt_iscsi_en

..."Root" + if found_boot: + mount_boot() + if not os.path.ismount("/boot"): + log("Boot partition not available") + sys.exit(1) + # Grab OVIRT_ISCSI VARIABLES from boot partition for upgrading + # file created only if OVIRT_ISCSI_ENABLED=y + if os.path.exists("/boot/ovirt"): + try: + f = open("/boot/ovirt", 'r') + for line in f: + try: + line = line.strip() + key, value = line.split(&quot...

.../$grub_dev_label|awk {' print "disk=" substr($1,1,length($1)-1); @@ -62,54 +62,57 @@ ovirt_boot_setup() { return 1 fi - mountpoint /liveos - if [ $? -ne 0 ] ; then - log "Root partition not available" - return 1 - fi + if [ "$OVIRT_ISCSI_ENABLED" != "y" ]; then + mount_liveos + mountpoint /liveos + if [ $? -ne 0 ] ; then + log "Root partition not available" + return 1 + fi - if [ ! -e "$disk" ]; then - # e.g. c0d0p1 - disk="$disk2&...

...boot + mountpoint /boot + if [ $? -ne 0 ] ; then + log "Boot partition not available" + return 1 + fi + grub_dev_label="Boot" + # Grab OVIRT_ISCSI VARIABLES from boot partition for upgrading + # file created only if OVIRT_ISCSI_ENABLED=y + if [ -f /boot/ovirt ]; then + . /boot/ovirt + iscsiadm -p $OVIRT_ISCSI_TARGET_IP:$OVIRT_ISCSI_TARGET_PORT -m discovery -t sendtargets + log "Restarting iscsi service" + service iscsi restart + fi + else + grub_dev_label=&quo...

...VIRT_SHARED_ROOT $OVIRT_SHARED_ROOT + set /files$OVIRT_DEFAULTS/OVIRT_ROOT_INSTALL $OVIRT_ROOT_INSTALL +EOF printf "\n\nPlease select the disk to use for the HostVG.\n\n" HOSTVGDRIVE=$(get_dev_name) || return 0 @@ -402,6 +418,8 @@ do_configure() if [ "$OVIRT_ISCSI_ENABLED" == "y" ]; then partlist="boot" # swap root config logging data" local space_left=$BOOTDRIVESPACE + elif [ "$OVIRT_ROOT_INSTALL" == "n" ]; then + partlist="swap config logging data" else partl...

...boot mountpoint /boot if [ $? -ne 0 ] ; then log "Boot partition not available" return 1 fi - grub_dev_label="Boot" # Grab OVIRT_ISCSI VARIABLES from boot partition for upgrading # file created only if OVIRT_ISCSI_ENABLED=y if [ -f /boot/ovirt ]; then @@ -50,7 +57,7 @@ ovirt_boot_setup() { fi # check that /boot mounted ok and find partition number for GRUB - get_part_info $(readlink -f /dev/disk/by-label/$grub_dev_label disk partN + get_part_info $(readlink -f $(findfs LABEL=$grub_dev_...

Previous implementation had staticly defined partitions to remove. This would break in the case of split Root and HostVG devices. Signed-off-by: Mike Burns <mburns at redhat.com> --- scripts/ovirt-config-boot | 11 +-------- scripts/ovirt-config-uninstall | 48 ++++++++++++++++++++++++--------------- scripts/ovirt-functions | 33 +++++++++++++++++++++++++++ 3 files

...)) disk partN y rc=$? if [ $rc -ne 0 -o $partN -lt 0 ]; then log "unable to determine Root partition" @@ -228,7 +228,9 @@ fi rc=$? if [ $rc -eq 0 -a "$doreboot" = "yes" ]; then disable_firstboot - ovirt_store_firstboot_config + if [ "$OVIRT_ISCSI_ENABLED" != "y" ]; then + ovirt_store_firstboot_config + fi stop_log reboot diff --git a/scripts/ovirt-config-networking b/scripts/ovirt-config-networking index 4d412ac..810d0e0 100755 --- a/scripts/ovirt-config-networking +++ b/scripts/ovirt-config-networking @@ -...

...g("Wiping LVM on HOSTVGDRIVE") self.wipe_lvm_on_disk(self.HOSTVGDRIVE) + log("Wiping LVM on ROOTDRIVE") self.wipe_lvm_on_disk(self.ROOTDRIVE) self.boot_size_si = self.BOOT_SIZE * (1024 * 1024) / (1000 * 1000) if OVIRT_VARS.has_key("OVIRT_ISCSI_ENABLED") and OVIRT_VARS["OVIRT_ISCSI_ENABLED"] == "y": -- 1.7.4.4

...]; then drive_list="ROOT" ROOT_NEED_SIZE=$(echo "scale=0; $ROOT_SIZE * 2 + $HOSTVG_NEED_SIZE"| bc -l) else @@ -204,7 +204,7 @@ check_partition_sizes() # check if an existing HostVG exists on a device other than the target if [ "$OVIRT_ISCSI_ENABLED" != "y" ]; then devices="$(pvs -o pv_name,vg_name --noheadings | \ - grep "HostVG"|grep -v $HOSTVGDRIVE|awk '{ print $1 }')" + grep "HostVG"|grep -v "$HOSTVGDRIVE"|awk '{ print $1 }')"...

...if [ $rc -ne 0 ]; then @@ -97,7 +97,7 @@ ovirt_boot_setup() { return $rc fi - mount $candidate_dev /liveos/ + mount "$candidate_dev" /liveos/ rm -rf /liveos/LiveOS mkdir -p /liveos/LiveOS @@ -175,7 +175,7 @@ EOF if [ "$OVIRT_ISCSI_ENABLED" != "y" ]; then umount /liveos # mark new Root ready to go, reboot() in ovirt-function switches it to active - e2label $candidate_dev RootUpdate + e2label "$candidate_dev" RootUpdate fi rm -rf $tmpdir diff --git a/scripts/ovir...

...-lt 0 ]; then log "unable to determine Root partition" @@ -217,7 +217,9 @@ ovirt_boot_setup "$live" "$bootparams" rc=$? if [ $rc -eq 0 -a "$doreboot" = "yes" ]; then disable_firstboot - ovirt_store_firstboot_config + if [ "$OVIRT_ISCSI_ENABLED" != "y" ]; then + ovirt_store_firstboot_config + fi stop_log reboot diff --git a/scripts/ovirt-config-networking b/scripts/ovirt-config-networking index 4d412ac..810d0e0 100755 --- a/scripts/ovirt-config-networking +++ b/scripts/ovirt-config-networking @@ -...

...egrep dm-[0-9]+ | sed -r 's/^.& (dm-[0-9]+) .*$/\1/') + + local mpath_device= + get_dm_device $dm_dev $mpath_device if [ -z "$mpath_device" ]; then mpath_device=$dev @@ -152,12 +164,12 @@ check_partition_sizes() printf "\n" if [ "$OVIRT_ISCSI_ENABLED" == "y" ]; then - get_drive_size $BOOTDRIVE BOOTDRIVESPACE + get_drive_size "$BOOTDRIVE" BOOTDRIVESPACE drive_list="BOOT" BOOT_NEED_SIZE=$BOOT_SIZE else - get_drive_size $ROOTDRIVE ROOTDRIVESPACE - get_drive_...

...absolute dir: %s" % dir + sys.exit(1) + os.system("mkdir -p %s%s") % (OVIRT_BACKUP_DIR, dir) + if os.path.exists(file): + shutil.copy(file, OVIRT_BACKUP_DIR + file) + +# reboot wrapper +# cleanup before reboot +def reboot(): + if not OVIRT_VARS.has_key("$OVIRT_ISCSI_ENABLED"): + # setup new Root if update is prepared + ret = os.system("findfs LABEL=RootUpdate >/dev/null 2>&1") + if ret == 0: + root_update_dev_lookup = subprocess.Popen("findfs LABEL=RootUpdate >/dev/null 2>&1", shell=True...

This set of patches introduces support for multipath devices for storage. Comments and suggestions are appreciated. Mike

...@@ -123,6 +125,10 @@ check_partition_sizes() if [ "$DATA_SIZE" = -1 ]; then min_data_size=5 fi + local min_data2_size="$DATA2_SIZE" + if [ "$DATA_SIZE2" = -1 ]; then + min_data_size=5 + fi printf "\n" if [ "$OVIRT_ISCSI_ENABLED" = "y" ]; then @@ -131,7 +137,27 @@ check_partition_sizes() BOOT_NEED_SIZE="$BOOT_SIZE" else get_drive_size "$ROOTDRIVE" ROOTDRIVESPACE - get_drive_size "$HOSTVGDRIVE" HOSTVGDRIVESPACE + for drv in $HOSTVGDRIVE;...