Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sync noble updates; reqs #12

Merged
merged 1 commit into from
Jun 1, 2024
Merged

sync noble updates; reqs #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
*.tar*
*.jar
*.zip
*.pdf
.ansible
inventory/*
!inventory/example
0 requirements.yml → ansible/requirements.yml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion bin/kvm-mgr.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Creates and manages KVM infrastructure using a JSON manifest.
#
PNAME=${0##*\/}
VERSION="v24.05"
VERSION="v24.06"
AUTHOR="Timothy C. Arland <tcarland@gmail.com>"

pool="default"
Expand Down
30 changes: 19 additions & 11 deletions bin/kvmsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,23 @@
# Timothy C. Arland <tcarland@gmail.com>
#
PNAME=${0##*\/}
VERSION="v24.05"
VERSION="v24.06"
AUTHOR="tcarland@gmail.com"

# ------------------------------------
# defaults
ubuntu="ubuntu22.04" # default os-var

jammy="ubuntu-22.04.4-live-server-amd64.iso" # default image
jamdesk="ubuntu-22.04.4-desktop-amd64.iso"
focal="ubuntu-20.04.1-legacy-server-amd64.iso"
numbats="ubuntu-24.04-live-server-amd64.iso"
numbat="ubuntu-24.04-desktop-amd64.iso"
jammy_desk="ubuntu-22.04.4-desktop-amd64.iso"

noble="ubuntu-24.04-live-server-amd64.iso"
noble_desk="ubuntu-24.04-desktop-amd64.iso"

pool="default"
network="bridge=virbr0"
osvar=${ubuntu}
image="${KVMSH_DEFAULT_IMAGE}"
image="${KVMSH_DEFAULT_IMAGE:-$jammy}"

memory="1024,maxmemory=2048"
vcpus="1"
Expand All @@ -44,7 +45,7 @@ vnc="vnc,listen=0.0.0.0"
serial="console=ttyS0,115200n8"
mac=

# maps pool name to storage target
# map storage pool name to storage target
declare -A poolmap

# ------------------------------------
Expand Down Expand Up @@ -110,6 +111,7 @@ Actions:
pool-autostart <pool> : Set 'autostart' for pool.
vol-list <pool> : List volumes in pool.
list : List all virtual machines.
os-list : List os-variants available to KVM.
console <name> : Connect to the VM console.
mac-addr <name> : Print HW MacAddress for the given VM.
"
Expand Down Expand Up @@ -432,7 +434,7 @@ create)
osvar="$ubuntu"
elif [ -z "$osvar" ]; then
echo "$PNAME error: image provided but not os-variant, --osvar is required."
echo " The virsh tool 'osinfo-query os' will list os-variants."
echo " use 'os-list' action to show os-variants."
exit 1
fi

Expand Down Expand Up @@ -463,6 +465,7 @@ create)
if [ $uefi -eq 0 ]; then
cmdargs+=(--boot "uefi")
fi

if [ $cdrom -eq 0 ]; then
cmdargs+=(--cdrom "$srcimg")
else
Expand Down Expand Up @@ -684,7 +687,7 @@ pool-create|create-pool)
echo "$PNAME Error in pool-define" >&2
exit $rt
fi
echo " -> Pool '$pool' defined."
echo " -> Storage Pool '$pool' defined."

( $virsh pool-build $pool )

Expand All @@ -693,7 +696,7 @@ pool-create|create-pool)
echo "$PNAME Error building pool"
exit $rt
fi
echo " -> Pool '$pool' built successfully."
echo " -> Storage Pool '$pool' built successfully."

( $virsh pool-start $pool )

Expand All @@ -702,7 +705,7 @@ pool-create|create-pool)
echo "$PNAME Error starting pool" >&2
exit $rt
fi
echo " -> Pool '$pool' started successfully."
echo " -> Storage Pool '$pool' started successfully."
else
echo "( $virsh pool-define-as $pool dir - - - - '$name' )"
echo "( $virsh pool-build $pool )"
Expand Down Expand Up @@ -804,6 +807,11 @@ list-vm*|list|ls)
list_vms
;;

# -- OSINFO LIST
os-list|os-info)
osinfo-query os
;;

# --- LIST VOLUMES
vol-list|list-vol*)
if [ -n "$name" ]; then
Expand Down
Loading