Skip to content

Commit f6b8c71

Browse files
committed
Update waagent to v2.15.0.1 and keep systemd config in sync
* upgrades waagent to the latest version * syncs the systemd config, which adds memory-accounting and a dependency to cloud-init.service, which ensures that the waagent.service does not start before cloud-init has finished. <https://github.com/Azure/WALinuxAgent/blob/v2.15.0.1/init/ubuntu/walinuxagent.service>
1 parent dcd32c1 commit f6b8c71

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

stemcell_builder/stages/system_azure_init/apply.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ packages="python3 python3-pyasn1 python3-setuptools python3-distro python-is-pyt
99
cloud-init azure-vm-utils linux-cloud-tools-common linux-cloud-tools-generic"
1010
pkg_mgr install $packages
1111

12-
wala_release=2.9.1.1
13-
wala_expected_sha1=b61bd57f3b2f7b048d6bab2739690bbf1d9c213b
12+
wala_release=2.15.0.1
13+
wala_expected_sha1=155fd6f326a2bf2ff97b4ea2e2c83dc16a9c1768
1414

1515
curl -L https://github.com/Azure/WALinuxAgent/archive/v${wala_release}.tar.gz > /tmp/wala.tar.gz
1616
sha1=$(cat /tmp/wala.tar.gz | openssl dgst -sha1 | awk 'BEGIN {FS="="}; {gsub(/ /,"",$2); print $2}')

stemcell_builder/stages/system_azure_init/assets/etc/waagent/walinuxagent.service

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
[Unit]
88
Description=Azure Linux Agent
99

10-
After=network-online.target
11-
Wants=network-online.target ssh.service sshd-keygen.service
10+
After=network-online.target cloud-init.service
11+
Wants=network-online.target sshd.service sshd-keygen.service
1212

1313
ConditionFileIsExecutable=/usr/sbin/waagent
1414
ConditionPathExists=/etc/waagent.conf
@@ -22,6 +22,7 @@ ExecStart=/usr/bin/python3 -u /usr/sbin/waagent -daemon
2222
Restart=always
2323
Slice=azure.slice
2424
CPUAccounting=yes
25+
MemoryAccounting=yes
2526

2627
[Install]
2728
WantedBy=multi-user.target

0 commit comments

Comments
 (0)