Skip time consuming VM syncing during installation, cleanup.

This commit is contained in:
Andreas B. Mundt 2023-02-18 10:00:23 +01:00
parent 354075f530
commit cb9f5fdb23
3 changed files with 14 additions and 16 deletions

View file

@ -3,17 +3,15 @@ domains = {{ domain }}
config_file_version = 2
[domain/{{ domain }}]
default_shell = /bin/bash
krb5_realm = {{ domain | upper }}
ad_domain = {{ domain }}
id_provider = ad
access_provider = ad
use_fully_qualified_names = False
cache_credentials = True
krb5_store_password_if_offline = True
cache_credentials = True
krb5_realm = {{ domain | upper }}
id_provider = ad
#override_homedir = /home/%u
ad_domain = {{ domain }}
use_fully_qualified_names = False
ldap_id_mapping = True
access_provider = ad
ad_gpo_access_control = permissive
default_shell = /usr/bin/bash
# default: # ldap_id_mapping = True
ad_gpo_access_control = disabled
ad_gpo_ignore_unreadable = True
ad_maximum_machine_account_password_age = 0

View file

@ -9,7 +9,7 @@ This script takes as input the name of the VM to rebase one level down
-n new name of the rebased image
EOF
}
while getopts ':n:' OPTION; do
case "$OPTION" in
n)
@ -21,10 +21,10 @@ while getopts ':n:' OPTION; do
;;
esac
done
shift "$((OPTIND -1))"
# if less or more than one arguments supplied, display usage
# if less or more than one arguments supplied, display usage
if [[ $# -ne 1 ]]; then
show_help
exit 1
@ -51,7 +51,7 @@ NUMBASES=$(qemu-img info --backing-chain "${VM_NAME}.qcow2" | grep -c image)
NEWBASE=$(qemu-img info --backing-chain "${VM_NAME}.qcow2" | grep image | head -n 3 | tail -n 1 | cut -d' ' -f2)
CURRENTBASE=$(qemu-img info --backing-chain "${VM_NAME}.qcow2" | grep image | head -n 2 | tail -n 1 | cut -d' ' -f2)
if [[ ! "${NUMBASES}" -ge 3 ]]; then
if [[ ! "${NUMBASES}" -ge 3 ]]; then
echo "Image must have at least 2 backing-files"
exit 1
fi
@ -64,7 +64,7 @@ fi
# rebasing disk image
qemu-img rebase -f qcow2 -b "${NEWBASE}" -F qcow2 "${VM_NAME}.qcow2"
if [[ -v NEWNAME ]]; then
if [[ -v NEWNAME ]]; then
# copy and adapt machine definition file
CURRENTNAME="${CURRENTBASE/.qcow2/}"
cp "xml/${CURRENTNAME}.xml" "xml/${NEWNAME}.xml"

View file

@ -111,4 +111,4 @@
command: rsync -a -i --files-from=/var/lib/libvirt/images/images.list rsync://server:/vmimages-download/ /var/lib/libvirt/images/
register: result
changed_when: result.stdout | length > 0
when: (ansible_mounts | selectattr("mount", "equalto", "/") | list)[0].size_available > 80000000000
when: not run_in_installer | default(false) | bool and (ansible_mounts | selectattr("mount", "equalto", "/") | list)[0].size_available > 80000000000