Skip to content

Commit db3c593

Browse files
authored
Merge pull request #461 from s4heid/waagent-update
Update waagent to v2.15.0.1
2 parents 0405541 + 718bb01 commit db3c593

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

stemcell_builder/stages/system_azure_init/apply.sh

Lines changed: 3 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 linux-cloud-tools-common linux-cloud-tools-generic"
1010
pkg_mgr install $packages
1111

12-
wala_release=2.14.0.1
13-
wala_expected_sha1=e8f30e34eedc9280531af1bb1af9efb53d1a1039
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}')
@@ -33,6 +33,7 @@ run_in_chroot $chroot "
3333
sudo rm -fr WALinuxAgent-${wala_release}
3434
rm wala.tar.gz
3535
"
36+
mkdir -p $chroot/var/log/azure
3637
cp -f $dir/assets/etc/waagent/waagent.conf $chroot/etc/waagent.conf
3738
cp -f $dir/assets/etc/waagent/walinuxagent.service $chroot/lib/systemd/system/walinuxagent.service
3839
chmod 0644 $chroot/lib/systemd/system/walinuxagent.service

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

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

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

1313
ConditionFileIsExecutable=/usr/sbin/waagent
@@ -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)