diff --git a/olasd/azure/create-vm.sh b/olasd/azure/create-vm.sh index 0ef75f3..edc4e9a 100755 --- a/olasd/azure/create-vm.sh +++ b/olasd/azure/create-vm.sh @@ -1,34 +1,34 @@ #!/bin/sh worker=${1-worker01} zone=westeurope resource_prefix=euwest resource_group="${resource_prefix}-workers" -image=credativ:Debian:8:latest +image=credativ:Debian:9:latest # pub_key=~/.ssh/id-rsa-swhworker.pub pub_key=~/.ssh/id_rsa.inria.pub # "default" subnet in the "swh-vnet" virtual network of the "swh-resource" resource group subnet=/subscriptions/49b7f681-8efc-4689-8524-870fc0c1db09/resourceGroups/swh-resource/providers/Microsoft.Network/virtualNetworks/swh-vnet/subnets/default # Change for virtual machine size. Standard_DS = SSD; Standard_S = Standard disk # size=Standard_DS11_v2 size=Standard_DS2_v2 # SSD disk_group="${resource_prefix}workersdisks" # Standard # disk_group="${resource_prefix}stddisks" diagnostics_resource=swhresourcediag966 azure vm create \ -g "${resource_group}" \ -n "${worker}-${resource_prefix}" \ -l "${zone}" \ -y Linux -Q "${image}" \ -S "${subnet}" -f "${worker}-${resource_prefix}-if" \ -u testadmin -M "${pub_key}" \ -o "${disk_group}" \ -z "${size}" \ --boot-diagnostics-storage-uri "http://${diagnostics_resource}.blob.core.windows.net/" diff --git a/olasd/azure/provision-vm.sh b/olasd/azure/provision-vm.sh index 8942b78..ff1509d 100755 --- a/olasd/azure/provision-vm.sh +++ b/olasd/azure/provision-vm.sh @@ -1,79 +1,63 @@ #!/bin/bash set -ex cd / ORIG_HOSTNAME="$(hostname)" HOSTNAME=${ORIG_HOSTNAME/-*/}.euwest.azure IP=$(ip a | grep 192 | awk '{print $2}' | awk -F/ '{print $1}') apt-get update apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" dist-upgrade echo $HOSTNAME > /etc/hostname hostnamectl set-hostname $HOSTNAME cat >> /etc/hosts << EOF $IP $HOSTNAME.internal.softwareheritage.org $HOSTNAME 192.168.100.100 db 192.168.100.101 uffizi 192.168.100.31 moma EOF mkdir -p /etc/resolvconf/resolv.conf.d echo search internal.softwareheritage.org > /etc/resolvconf/resolv.conf.d/tail apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install resolvconf nfs-common -### puppet from backport - -cat >/etc/apt/sources.list.d/backports.list </etc/apt/preferences.d/puppet.pref < /etc/facter/facts.d/location.txt service puppet stop systemctl disable puppet.service puppet agent --enable augtool << "EOF" set /files/etc/puppet/puppet.conf/agent/server pergamon.internal.softwareheritage.org set /files/etc/puppet/puppet.conf/agent/report true set /files/etc/puppet/puppet.conf/agent/pluginsync true save EOF rm -rf /root/.ssh deluser testadmin rm -rf /home/testadmin puppet agent --test || true reboot