X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=mcp%2Fscripts%2Flib.sh;h=63a5adc5a7933a37ea58f92facf580b176f69b38;hb=fac41836e91dd56696c3a435bfdbc7adf53899e2;hp=654f45e1fc3526978d2f3ecd4907aeb0780840ce;hpb=0cd4332f168052af8887d794b16efa7ba661d509;p=fuel.git diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh index 654f45e1f..63a5adc5a 100644 --- a/mcp/scripts/lib.sh +++ b/mcp/scripts/lib.sh @@ -35,12 +35,83 @@ function get_base_image { wget -P "${image_dir}" -N "${base_image}" } +function __kernel_modules { + # Load mandatory kernel modules: loop, nbd + local image_dir=$1 + sudo modprobe -f loop + if sudo modprobe -f nbd max_part=8; then + return 0 + fi + # CentOS (or RHEL family in general) do not provide 'nbd' out of the box + echo "[WARN] 'nbd' kernel module cannot be loaded!" + if [ ! -e /etc/redhat-release ]; then + echo "[ERROR] Non-RHEL system detected, aborting!" + echo "[ERROR] Try building 'nbd' manually or install it from a 3rd party." + exit 1 + fi + + # Best-effort attempt at building a non-maintaned kernel module + local __baseurl + local __subdir + local __uname_r=$(uname -r) + local __uname_m=$(uname -m) + if [ "${__uname_m}" = 'x86_64' ]; then + __baseurl='http://vault.centos.org/centos' + __subdir='Source/SPackages' + __srpm="kernel-${__uname_r%.${__uname_m}}.src.rpm" + else + __baseurl='http://vault.centos.org/altarch' + __subdir="Source/${__uname_m}/Source/SPackages" + # NOTE: fmt varies across releases (e.g. kernel-alt-4.11.0-44.el7a.src.rpm) + __srpm="kernel-alt-${__uname_r%.${__uname_m}}.src.rpm" + fi + + local __found='n' + local __versions=$(curl -s "${__baseurl}/" | grep -Po 'href="\K7\.[\d\.]+') + for ver in ${__versions}; do + for comp in os updates; do + local url="${__baseurl}/${ver}/${comp}/${__subdir}/${__srpm}" + if wget "${url}" -O "${image_dir}/${__srpm}" > /dev/null 2>&1; then + __found='y'; break 2 + fi + done + done + + if [ "${__found}" = 'n' ]; then + echo "[ERROR] Can't find the linux kernel SRPM for: ${__uname_r}" + echo "[ERROR] 'nbd' module cannot be built, aborting!" + echo "[ERROR] Try 'yum upgrade' or building 'nbd' krn module manually ..." + exit 1 + fi + + rpm -ivh "${image_dir}/${__srpm}" 2> /dev/null + mkdir -p ~/rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS} + # shellcheck disable=SC2016 + echo '%_topdir %(echo $HOME)/rpmbuild' > ~/.rpmmacros + ( + cd ~/rpmbuild/SPECS + rpmbuild -bp --nodeps --target="${__uname_m}" kernel*.spec + cd ~/rpmbuild/BUILD/"${__srpm%.src.rpm}"/linux-* + sed -i 's/^.*\(CONFIG_BLK_DEV_NBD\).*$/\1=m/g' .config + # http://centosfaq.org/centos/nbd-does-not-compile-for-3100-514262el7x86_64 + if grep -Rq 'REQ_TYPE_DRV_PRIV' drivers/block; then + sed -i 's/REQ_TYPE_SPECIAL/REQ_TYPE_DRV_PRIV/g' drivers/block/nbd.c + fi + gunzip -c "/boot/symvers-${__uname_r}.gz" > Module.symvers + make prepare modules_prepare + make M=drivers/block -j + modinfo drivers/block/nbd.ko + sudo mkdir -p "/lib/modules/${__uname_r}/extra/" + sudo cp drivers/block/nbd.ko "/lib/modules/${__uname_r}/extra/" + ) + sudo depmod -a && sudo modprobe -f nbd max_part=8 +} + function mount_image { local image=$1 local image_dir=$2 OPNFV_MNT_DIR="${image_dir}/ubuntu" - sudo modprobe nbd loop # Find free nbd, loop devices for dev in '/sys/class/block/nbd'*; do if [ "$(cat "${dev}/size")" = '0' ]; then @@ -49,14 +120,22 @@ function mount_image { fi done OPNFV_LOOP_DEV=$(losetup -f) + OPNFV_MAP_DEV=/dev/mapper/$(basename "${OPNFV_NBD_DEV}")p1 export OPNFV_MNT_DIR OPNFV_LOOP_DEV [ -n "${OPNFV_NBD_DEV}" ] && [ -n "${OPNFV_LOOP_DEV}" ] || exit 1 + qemu-img resize "${image_dir}/${image}" 3G sudo qemu-nbd --connect="${OPNFV_NBD_DEV}" --aio=native --cache=none \ "${image_dir}/${image}" + sudo kpartx -av "${OPNFV_NBD_DEV}" sleep 5 # /dev/nbdNp1 takes some time to come up - # grub-update does not like /dev/nbd*, so use a loop device to work around it # Hardcode partition index to 1, unlikely to change for Ubuntu UCA image - sudo losetup "${OPNFV_LOOP_DEV}" "${OPNFV_NBD_DEV}p1" + if sudo growpart "${OPNFV_NBD_DEV}" 1; then + sudo kpartx -u "${OPNFV_NBD_DEV}" + sudo e2fsck -pf "${OPNFV_MAP_DEV}" + sudo resize2fs "${OPNFV_MAP_DEV}" + fi + # grub-update does not like /dev/nbd*, so use a loop device to work around it + sudo losetup "${OPNFV_LOOP_DEV}" "${OPNFV_MAP_DEV}" mkdir -p "${OPNFV_MNT_DIR}" sudo mount "${OPNFV_LOOP_DEV}" "${OPNFV_MNT_DIR}" sudo mount -t proc proc "${OPNFV_MNT_DIR}/proc" @@ -66,6 +145,8 @@ function mount_image { sudo cp /etc/resolv.conf "${OPNFV_MNT_DIR}/run/resolvconf" echo "GRUB_DISABLE_OS_PROBER=true" | \ sudo tee -a "${OPNFV_MNT_DIR}/etc/default/grub" + sudo sed -i -e 's/^\(GRUB_TIMEOUT\)=.*$/\1=1/g' -e 's/^GRUB_HIDDEN.*$//g' \ + "${OPNFV_MNT_DIR}/etc/default/grub" } function apt_repos_pkgs_image { @@ -135,14 +216,16 @@ function cleanup_mounts { sudo losetup -d "${OPNFV_LOOP_DEV}" fi if [ -n "${OPNFV_NBD_DEV}" ]; then + sudo kpartx -d "${OPNFV_NBD_DEV}" || true sudo qemu-nbd -d "${OPNFV_NBD_DEV}" || true fi } function cleanup_uefi { # Clean up Ubuntu boot entry if cfg01, kvm nodes online from previous deploy - # shellcheck disable=SC2086 - ssh ${SSH_OPTS} "${SSH_SALT}" "sudo salt -C 'kvm* or cmp*' cmd.run \ + local cmd_str="ssh ${SSH_OPTS} ${SSH_SALT}" + [ ! "$(hostname)" = 'cfg01' ] || cmd_str='eval' + ${cmd_str} "sudo salt -C 'kvm* or cmp*' cmd.run \ \"which efibootmgr > /dev/null 2>&1 && \ efibootmgr | grep -oP '(?<=Boot)[0-9]+(?=.*ubuntu)' | \ xargs -I{} efibootmgr --delete-bootnum --bootnum {}; \ @@ -167,26 +250,38 @@ function prepare_vms { local repos_pkgs_str=$1; shift # ^-sep list of repos, pkgs to install/rm local vnodes=("$@") local image=base_image_opnfv_fuel.img + local vcp_image=${image%.*}_vcp.img + local _o=${base_image/*\/} + local _h=$(echo "${repos_pkgs_str}.$(md5sum "${image_dir}/${_o}")" | \ + md5sum | cut -c -8) + local _tmp cleanup_uefi cleanup_vms get_base_image "${base_image}" "${image_dir}" + IFS='^' read -r -a repos_pkgs <<< "${repos_pkgs_str}" - rm -f "${image_dir}/${image%.*}"* - if [[ ! "${repos_pkgs_str}" =~ ^\^+$ ]]; then - IFS='^' read -r -a repos_pkgs <<< "${repos_pkgs_str}" - cp "${image_dir}/${base_image/*\/}" "${image_dir}/${image}" - mount_image "${image}" "${image_dir}" - apt_repos_pkgs_image "${repos_pkgs[@]:0:4}" - cleanup_mounts + echo "[INFO] Lookup cache / build patched base image for fingerprint: ${_h}" + _tmp="${image%.*}.${_h}.img" + if [ -f "$(readlink -f "${image_dir}/${_tmp}")" ]; then + echo "[INFO] Patched base image found" else - ln -sf "${image_dir}/${base_image/*\/}" "${image_dir}/${image}" + rm -f "${image_dir}/${image%.*}"* + if [[ ! "${repos_pkgs_str}" =~ ^\^+$ ]]; then + echo "[INFO] Patching base image ..." + cp "${image_dir}/${_o}" "${image_dir}/${_tmp}" + __kernel_modules "${image_dir}" + mount_image "${_tmp}" "${image_dir}" + apt_repos_pkgs_image "${repos_pkgs[@]:0:4}" + cleanup_mounts + else + echo "[INFO] No patching required, using vanilla base image" + ln -sf "${image_dir}/${_o}" "${image_dir}/${_tmp}" + fi fi + ln -sf "${image_dir}/${_tmp}" "${image_dir}/${image}" - # CWD should be - # shellcheck disable=SC2016 - envsubst '${SALT_MASTER},${CLUSTER_DOMAIN}' < \ - user-data.template > user-data.sh + envsubst < user-data.template > user-data.sh # CWD should be # Create config ISO and resize OS disk image for each foundation node VM for node in "${vnodes[@]}"; do @@ -198,10 +293,19 @@ function prepare_vms { # VCP VMs base image specific changes if [[ ! "${repos_pkgs_str}" =~ \^{3}$ ]] && [ -n "${repos_pkgs[*]:4}" ]; then - mount_image "${image}" "${image_dir}" - apt_repos_pkgs_image "${repos_pkgs[@]:4:4}" - cleanup_mounts - ln -sf "${image_dir}/${image}" "${image_dir}/${image%.*}_vcp.img" + echo "[INFO] Lookup cache / build patched VCP image for md5sum: ${_h}" + _tmp="${vcp_image%.*}.${_h}.img" + if [ -f "$(readlink -f "${image_dir}/${_tmp}")" ]; then + echo "[INFO] Patched VCP image found" + else + echo "[INFO] Patching VCP image ..." + cp "${image_dir}/${image}" "${image_dir}/${_tmp}" + __kernel_modules "${image_dir}" + mount_image "${_tmp}" "${image_dir}" + apt_repos_pkgs_image "${repos_pkgs[@]:4:4}" + cleanup_mounts + fi + ln -sf "${image_dir}/${_tmp}" "${image_dir}/${vcp_image}" fi } @@ -210,8 +314,7 @@ function create_networks { # create required networks, including constant "mcpcontrol" # FIXME(alav): since we renamed "pxe" to "mcpcontrol", we need to make sure # we delete the old "pxe" virtual network, or it would cause IP conflicts. - # FIXME(alav): The same applies for "fuel1" virsh network. - for net in "fuel1" "pxe" "mcpcontrol" "${vnode_networks[@]}"; do + for net in "pxe" "mcpcontrol" "${vnode_networks[@]}"; do if virsh net-info "${net}" >/dev/null 2>&1; then virsh net-destroy "${net}" || true virsh net-undefine "${net}" @@ -245,8 +348,8 @@ function create_vms { # prepare network args net_args=" --network network=mcpcontrol,model=virtio" - if [ "${vnode_data[0]}" = "mas01" ]; then - # MaaS node's 3rd interface gets connected to PXE/Admin Bridge + if [ "${DEPLOY_TYPE:-}" = 'baremetal' ]; then + # 3rd interface gets connected to PXE/Admin Bridge (cfg01, mas01) vnode_networks[2]="${vnode_networks[0]}" fi for net in "${vnode_networks[@]:1}"; do @@ -271,9 +374,9 @@ function update_mcpcontrol_network { local cmac=$(virsh domiflist cfg01 2>&1| awk '/mcpcontrol/ {print $5; exit}') local amac=$(virsh domiflist mas01 2>&1| awk '/mcpcontrol/ {print $5; exit}') virsh net-update "mcpcontrol" add ip-dhcp-host \ - "" --live + "" --live --config [ -z "${amac}" ] || virsh net-update "mcpcontrol" add ip-dhcp-host \ - "" --live + "" --live --config } function start_vms {