diff options
Diffstat (limited to 'mcp/scripts')
| -rw-r--r-- | mcp/scripts/lib.sh | 12 | ||||
| -rwxr-xr-x | mcp/scripts/salt.sh | 1 |
2 files changed, 3 insertions, 10 deletions
diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh index d2ffaa659..2038badfd 100644 --- a/mcp/scripts/lib.sh +++ b/mcp/scripts/lib.sh @@ -336,13 +336,6 @@ function create_vms { IFS='|' read -r -a vnodes <<< "$1"; shift local vnode_networks=("$@") - # AArch64: prepare arch specific arguments - local virt_extra_args="" - if [ "$(uname -i)" = "aarch64" ]; then - # No Cirrus VGA on AArch64, use virtio instead - virt_extra_args="$virt_extra_args --video=virtio" - fi - # create vms with specified options for serialized_vnode_data in "${vnodes[@]}"; do IFS=',' read -r -a vnode_data <<< "${serialized_vnode_data}" @@ -363,10 +356,9 @@ function create_vms { --cpu host-passthrough --accelerate ${net_args} \ --disk path="${image_dir}/mcp_${vnode_data[0]}.qcow2",format=qcow2,bus=virtio,cache=none,io=native \ --os-type linux --os-variant none \ - --boot hd --vnc --console pty --autostart --noreboot \ + --boot hd --nographics --console pty --autostart --noreboot \ --disk path="${image_dir}/mcp_${vnode_data[0]}.iso",device=cdrom \ - --noautoconsole \ - ${virt_extra_args} + --noautoconsole done } diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh index 1975f9e54..547137afe 100755 --- a/mcp/scripts/salt.sh +++ b/mcp/scripts/salt.sh @@ -70,6 +70,7 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END cd /srv/salt/scripts export DEBIAN_FRONTEND=noninteractive + echo 'Dpkg::Use-Pty "0";' > /etc/apt/apt.conf.d/90silence-dpkg OLD_DOMAIN=\$(grep -Pzo "id: cfg01\.\K(\S*)" /etc/salt/minion.d/minion.conf) || true BOOTSTRAP_SALTSTACK_OPTS=" -r -dX stable 2016.11 " \ MASTER_HOSTNAME=cfg01.${CLUSTER_DOMAIN} DISTRIB_REVISION=stable \ |