From a3ebfa596dc2ec4b83364df12f254669041684d5 Mon Sep 17 00:00:00 2001 From: "Xavier Pillons (MSFT)" Date: Tue, 26 Sep 2023 15:10:52 +0200 Subject: [PATCH] fix ubuntu deprovision and remove lustre client --- packer/azhop-compute-ubuntu-18_04.json | 5 +++-- packer/azhop-compute-ubuntu-20_04.json | 5 +++-- packer/azhop-desktop-ubuntu-20_04.json | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/packer/azhop-compute-ubuntu-18_04.json b/packer/azhop-compute-ubuntu-18_04.json index b0b859c03..29573e48d 100644 --- a/packer/azhop-compute-ubuntu-18_04.json +++ b/packer/azhop-compute-ubuntu-18_04.json @@ -42,11 +42,12 @@ "/tmp/openpbs.sh || exit 1", "/tmp/slurm.sh || exit 1", "/tmp/telegraf.sh || exit 1", - "/tmp/lustreclient.sh b2_14 || exit 1", "/tmp/zz-compute-custom.sh || exit 1", "echo ' This is the end '", "rm -rf /tmp/*.sh", - "/usr/sbin/waagent -force -deprovision+user && export HISTSIZE=0 && sync" + "/usr/sbin/waagent -force -deprovision+user", + "sed -i 's/^send host-name =.*/send host-name = \"\"/' /etc/dhcp/dhclient.conf", + "export HISTSIZE=0 && sync" ], "inline_shebang": "/bin/sh -x", "type": "shell", diff --git a/packer/azhop-compute-ubuntu-20_04.json b/packer/azhop-compute-ubuntu-20_04.json index ed83da9d2..6295e025a 100644 --- a/packer/azhop-compute-ubuntu-20_04.json +++ b/packer/azhop-compute-ubuntu-20_04.json @@ -42,11 +42,12 @@ "/tmp/openpbs.sh || exit 1", "/tmp/slurm.sh || exit 1", "/tmp/telegraf.sh || exit 1", - "/tmp/lustreclient.sh b2_15 || exit 1", "/tmp/zz-compute-custom.sh || exit 1", "echo ' This is the end '", "rm -rf /tmp/*.sh", - "/usr/sbin/waagent -force -deprovision+user && export HISTSIZE=0 && sync" + "/usr/sbin/waagent -force -deprovision+user", + "sed -i 's/^send host-name =.*/send host-name = \"\"/' /etc/dhcp/dhclient.conf", + "export HISTSIZE=0 && sync" ], "inline_shebang": "/bin/sh -x", "type": "shell", diff --git a/packer/azhop-desktop-ubuntu-20_04.json b/packer/azhop-desktop-ubuntu-20_04.json index a26768ffb..4cf52cfa1 100644 --- a/packer/azhop-desktop-ubuntu-20_04.json +++ b/packer/azhop-desktop-ubuntu-20_04.json @@ -42,13 +42,14 @@ "/tmp/openpbs.sh || exit 1", "/tmp/slurm.sh || exit 1", "/tmp/telegraf.sh || exit 1", - "/tmp/lustreclient.sh b2_15 || exit 1", "/tmp/interactive-desktop-3d.sh || exit 1", "/tmp/desktop-packages.sh || exit 1", "/tmp/zz-desktop-custom.sh || exit 1", "echo ' This is the end '", "rm -rf /tmp/*.sh", - "/usr/sbin/waagent -force -deprovision+user && export HISTSIZE=0 && sync" + "/usr/sbin/waagent -force -deprovision+user", + "sed -i 's/^send host-name =.*/send host-name = \"\"/' /etc/dhcp/dhclient.conf", + "export HISTSIZE=0 && sync" ], "inline_shebang": "/bin/sh -x", "type": "shell",