Update injection machine creation script

azure/injection/create-inject.sh

@@ -4,8 +4,7 @@
 
 set -e
 
-group="injection"
-storage_account="${group}"
+group="swh-injection"
 
 location="westeurope"
 
@@ -13,42 +12,36 @@ vm_name="$1"
 
 vm_size="Standard_DS5_v2"
 vm_subnet="/subscriptions/49b7f681-8efc-4689-8524-870fc0c1db09/resourceGroups/swh-resource/providers/Microsoft.Network/virtualNetworks/swh-vnet/subnets/default"
-vm_diagnostics="http://swhresourcediag966.blob.core.windows.net/"
+vm_nsg=""
 
 vm_user="injection"
 vm_sshkey="~/.ssh/id_rsa.inria.pub"
 
-vm_ndisks=11
+vm_ndisks=12
 
-if ! azure group show "$group" >/dev/null; then
-    azure group create "$group" "$location"
-fi
-
-if ! azure storage account show -g "$group" "$storage_account"; then
-    azure storage account create -g "$group" -l "$location" "$storage_account"
+if ! az group show "$group" >/dev/null; then
+    az group create "$group" "$location"
 fi
 
 azure vm create \
-      -g "${group}" \
-      -n "${vm_name}" \
-      -l "${location}" \
-      -y Linux -Q credativ:Debian:8:latest \
+      --resource-group "${group}" \
+      --name "${vm_name}" \
+      --size "${vm_size}" \
+      -y Linux \
+      --image credativ:Debian:9:latest \
+      --nsg "${vm_nsg}" \
       -S "${vm_subnet}" \
       -f "${vm_name}-if" \
       -i "${vm_name}-public" --public-ip-domain-name "swh${vm_name}" --public-ip-idletimeout 30 \
       -u "${vm_user}" -M "${vm_sshkey}" \
-      -o "${storage_account}" \
-      -z "${vm_size}" \
-      --boot-diagnostics-storage-uri "${vm_diagnostics}"
 
 for disk in $(seq 1 "${vm_ndisks}"); do
-    azure vm disk attach-new \
+    az vm disk attach \
+          --new \
           -g "${group}" \
-          -n "${vm_name}" \
-          -z 1023 \
-          -d "${vm_name}-data${disk}.vhd" \
-          -l "${disk}" \
-          -o "${storage_account}"
+          --vm-name "${vm_name}" \
+          --size-gb 1024 \
+          --disk "${vm_name}-data${disk}"
 done
 
 vm_hostname="swh${vm_name}.${location}.cloudapp.azure.com"

azure/injection/provision-inject.sh

@@ -5,34 +5,34 @@ set -e
 cat >> /home/injection/.ssh/authorized_keys <<EOF
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC9VE8ET+Iow9GzGnQc8Gup2LI5AvOb5aO29ZF28bVgnPyrOPOYWxVTArt1r5rWNXqboqN5PSJ35XtLQPl5amAbFnLlk3eUxsO71HdeM4ZVPNyotQVqXMQNMnnNzyjH8SVPWjYT8Ehf0tcuuY4PDMapqpw6FAxalon5/LK+nL889Ol5990GcXZFbNljJAWFVLQYkzZhfxe5RL94yn4vZi5g+emd1hfOETWKpSCgtftFEvT0v1sqpMOBrj67uC0mL3S0C6YblZSU5thZaiOvxgAcCHwKcPrXnKKyvhCsMciAbhOPGV/n+7O692aXTLzFtOZqXROEhivGX2Z7ldBuiySx olasd@uffizi
 EOF
-
-cat > /etc/apt/sources.list.d/softwareheritage.list <<EOF
-deb [trusted=yes] http://debian.internal.softwareheritage.org/ jessie main
+mkdir /root/.ssh
+cat >> /root/.ssh/authorized_keys <<EOF
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC9VE8ET+Iow9GzGnQc8Gup2LI5AvOb5aO29ZF28bVgnPyrOPOYWxVTArt1r5rWNXqboqN5PSJ35XtLQPl5amAbFnLlk3eUxsO71HdeM4ZVPNyotQVqXMQNMnnNzyjH8SVPWjYT8Ehf0tcuuY4PDMapqpw6FAxalon5/LK+nL889Ol5990GcXZFbNljJAWFVLQYkzZhfxe5RL94yn4vZi5g+emd1hfOETWKpSCgtftFEvT0v1sqpMOBrj67uC0mL3S0C6YblZSU5thZaiOvxgAcCHwKcPrXnKKyvhCsMciAbhOPGV/n+7O692aXTLzFtOZqXROEhivGX2Z7ldBuiySx olasd@uffizi
 EOF
 
-cat > /etc/apt/preferences.d/objstorage_cloud.pref <<EOF
-Explanation: Pin python3-azure-storage dependencies to backports
-Package: python3-cffi python3-cryptography python3-pkg-resources python3-pyasn1 python3-setuptools
-Pin: release n=jessie-backports
-Pin-Priority: 990
+apt-get update
+apt-get install -y apt-transport-https
+
+cat > /etc/apt/sources.list.d/softwareheritage.list <<EOF
+deb [trusted=yes] https://debian.softwareheritage.org/ jessie main
 EOF
 
 apt-get update
 apt-get -y dist-upgrade
-apt-get -y install mdadm rabbitmq-server python3-swh.objstorage.cloud python3-swh.storage.archiver python3-swh.scheduler
+apt-get -y install mdadm python3-swh.objstorage.cloud
 
 exit 0
 
-for disk in /dev/sd[c-m]; do
+for disk in /dev/sd[c-n]; do
     sfdisk $disk <<EOF
 unit: sectors
 
-/dev/sdc1 : start=     2048, size=2145384448, Id=fd
+/dev/sdc1 : start=     2048, size=2147481600, Id=fd
 /dev/sdc2 : start=        0, size=        0, Id= 0
 /dev/sdc3 : start=        0, size=        0, Id= 0
 /dev/sdc4 : start=        0, size=        0, Id= 0
 EOF
 done;
-mdadm --create /dev/md0 --level 0 --raid-devices 11 /dev/sd[c-m]1
+mdadm --create /dev/md0 --level 0 --raid-devices 12 /dev/sd[c-n]1
 /usr/share/mdadm/mkconf > /etc/mdadm/mdadm.conf
 update-initramfs -k all -u