search for: ask_yes_or_no

Added a new function, "ask_yes_or_no", to ovirt-functions. It contains a default prompt if none is provided. Changed all prompts that ask for yes, no and/or abort to use this new method. Signed-off-by: Darryl L. Pierce <dpierce at redhat.com> --- scripts/ovirt-config-boot-wrapper | 8 ++--- scripts/ovirt-config-collec...

...+- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/ovirt-config-networking b/scripts/ovirt-config-networking index e114538..7d4e363 100755 --- a/scripts/ovirt-config-networking +++ b/scripts/ovirt-config-networking @@ -343,7 +343,7 @@ function configure_dns ask_yes_or_no "Is this correct ([Y]es/[N]o/[A]bort)?" true true case $? in 0) break ;; - 1) ;; + 1) DNS="";; 2) return ;; esac done -- 1.6.2.5

...uot;$devices" ]; then printf "\n" @@ -357,11 +357,27 @@ do_configure() printf "\n\nPlease select the disk to use for the Root.\n\n" ROOTDRIVE=$(get_dev_name) || return 0 get_drive_size "$ROOTDRIVE" ROOTDRIVESPACE + if ask_yes_or_no "Will Root be shared with other nodes ([Y]es/[N]o)?"; then + OVIRT_SHARED_ROOT="y" + if ask_yes_or_no "Partition and install Root?"; then + OVIRT_ROOT_INSTALL="y" + else + OVIRT_ROOT_INSTALL=&quot...

...cripts/ovirt-config-storage +++ b/scripts/ovirt-config-storage @@ -357,6 +357,22 @@ do_configure() printf "\n\nPlease select the disk to use for the Root.\n\n" ROOTDRIVE=$(get_dev_name) || return 0 get_drive_size "$ROOTDRIVE" ROOTDRIVESPACE + if ask_yes_or_no "Will Root be shared with other nodes ([Y]es/[N]o)?"; then + OVIRT_SHARED_ROOT="y" + if ask_yes_or_no "Partition and install Root?"; then + OVIRT_ROOT_INSTALL="y" + else + OVIRT_ROOT_INSTALL=&quot...

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

...reating config partition" lvcreate --name Config --size ${CONFIG_SIZE}M /dev/HostVG diff --git a/scripts/ovirt-config-uninstall b/scripts/ovirt-config-uninstall index 02828a0..22633a0 100755 --- a/scripts/ovirt-config-uninstall +++ b/scripts/ovirt-config-uninstall @@ -42,6 +42,8 @@ if ask_yes_or_no "Do you wish to continue and uninstall this node ([Y]es/[N]o)?" drive=$(echo $partition | awk '{ print substr($0, 1, length($0) - 1) }') parted -s $drive "rm 1" parted -s $drive "rm 2" + parted -s $drive "rm 3" +...

...oot partition update candidate= if [ -e /dev/disk/by-label/RootBackup ]; then diff --git a/scripts/ovirt-config-uninstall b/scripts/ovirt-config-uninstall index 3b7b48d..b6675e7 100755 --- a/scripts/ovirt-config-uninstall +++ b/scripts/ovirt-config-uninstall @@ -37,27 +37,37 @@ if ask_yes_or_no "Do you wish to continue and uninstall this node ([Y]es/[N]o)?" rm -f /var/lib/multipath/bindings unmount_logging unmount_config /etc/default/ovirt + #get partition info + root2="" + if findfs LABEL=RootBackup 2>&1 >/dev/...

The following patches introduce support for multipath and cciss devices to the ovirt-node and node-image. Comments are appreciated. These patches assume that the 3 patches (2 node, 1 node-image) from Joey are all incorporated. Mike

...oot partition update candidate= if [ -e /dev/disk/by-label/RootBackup ]; then diff --git a/scripts/ovirt-config-uninstall b/scripts/ovirt-config-uninstall index 3b7b48d..b319abd 100755 --- a/scripts/ovirt-config-uninstall +++ b/scripts/ovirt-config-uninstall @@ -37,27 +37,38 @@ if ask_yes_or_no "Do you wish to continue and uninstall this node ([Y]es/[N]o)?" rm -f /var/lib/multipath/bindings unmount_logging unmount_config /etc/default/ovirt + #get partition info + local root2 + if findfs LABEL=RootBackup 2>&1 >/dev/null; t...

...oot partition update candidate= if [ -e /dev/disk/by-label/RootBackup ]; then diff --git a/scripts/ovirt-config-uninstall b/scripts/ovirt-config-uninstall index 3b7b48d..b6675e7 100755 --- a/scripts/ovirt-config-uninstall +++ b/scripts/ovirt-config-uninstall @@ -37,27 +37,37 @@ if ask_yes_or_no "Do you wish to continue and uninstall this node ([Y]es/[N]o)?" rm -f /var/lib/multipath/bindings unmount_logging unmount_config /etc/default/ovirt + #get partition info + root2="" + if findfs LABEL=RootBackup 2>&1 >/dev/...

...reating config partition" lvcreate --name Config --size ${CONFIG_SIZE}M /dev/HostVG diff --git a/scripts/ovirt-config-uninstall b/scripts/ovirt-config-uninstall index 20f8c2c..95a71a9 100755 --- a/scripts/ovirt-config-uninstall +++ b/scripts/ovirt-config-uninstall @@ -58,6 +58,8 @@ if ask_yes_or_no "Do you wish to continue and uninstall this node ([Y]es/[N]o)?" drive=$(echo $partition | awk '{ print substr($0, 1, length($0) - 1) }') parted -s $drive "rm 1" parted -s $drive "rm 2" + parted -s $drive "rm 3" +...

...;; + A|a) + CONFIGURED_NIC="" + VLAN_ID="" + return + ;; + esac + done printf "\n" ask_yes_or_no "Is this correct ([Y]es/[N]o/[A]bort)?" true true -- 1.6.2.5

...;<EOF + +The iSCSI target be configured as follows: +================================================ + Target IP: $OVIRT_ISCSI_TARGET_IP + Target Port: $OVIRT_ISCSI_TARGET_PORT + +EOF +# Username: $OVIRT_ISCSI_CHAP_USERNAME +# Password: $OVIRT_ISCSI_CHAP_PASSWORD +#EOF + +if ask_yes_or_no "Is this correct ([Y]es/[N]o)?" true true; then + + OVIRT_ISCSI_ENABLED="y" + augtool <<EOF +set /files/etc/default/ovirt/OVIRT_ISCSI_ENABLED y +set /files/etc/default/ovirt/OVIRT_ISCSI_TARGET_IP $OVIRT_ISCSI_TARGET_IP +set /files/etc/default/ovirt/OVIRT_ISCSI_TARGET...

...NFIG_SIZE:-$default_config_size} LOGGING_SIZE=${OVIRT_VOL_LOGGING_SIZE:-$default_logging_size} diff --git a/scripts/ovirt-config-uninstall b/scripts/ovirt-config-uninstall index 22633a0..820eead 100755 --- a/scripts/ovirt-config-uninstall +++ b/scripts/ovirt-config-uninstall @@ -34,16 +34,13 @@ if ask_yes_or_no "Do you wish to continue and uninstall this node ([Y]es/[N]o)?" unmount_logging log "Removing volume group" wipe_volume_group "HostVG" - partition=$(findfs LABEL=BOOT) + partition=$(findfs LABEL=Root) if [ -n "$partition" ]; then - log "Unmou...

All other patches from the sequence remain unchanged. Repost of patch 6 based on comments from Joey to follow. Mike

...e - if check_existing_hostvg $HOSTVGDRIVE devs; then + if check_existing_hostvg "$HOSTVGDRIVE" devs; then for dev in $devs do printf "Removing HostVG on $dev will erase the drive and cannot be undone\n" if ask_yes_or_no "Do you want to remove HostVG from $dev (y/n)?"; then start_log - if ! wipe_lvm_on_disk $dev; then + if ! wipe_lvm_on_disk "$dev"; then stop_log return 1...

I'm looking for feedback on this first patch. The node has been pushed towards a more generic boot process. With this patch the node can now boot up and execute a few specifically-named scripts that reside in /etc/node.d/ at key points during the startup. After this goes upstream, the next step will be to define in more detail the remote interfaces for the "managed" runtime

This patch supercedes the previous one by moving the functionality for relocating files into the make system.