зеркало из https://github.com/Azure/ARO-RP.git
Add expired client workaround
This commit is contained in:
Родитель
278e59131d
Коммит
4bdb4e1a3e
|
@ -222,7 +222,7 @@
|
|||
"autoUpgradeMinorVersion": true,
|
||||
"settings": {},
|
||||
"protectedSettings": {
|
||||
"script": "[base64(concat(base64ToString('c2V0IC1lCgo='),'CIAZPTOKEN=''',parameters('ciAzpToken'),'''\n','CIPOOLNAME=''',parameters('ciPoolName'),'''\n','\n',base64ToString('Cnl1bSAteSB1cGRhdGUgLXggV0FMaW51eEFnZW50CgpsdmV4dGVuZCAtbCArNTAlRlJFRSAvZGV2L3Jvb3R2Zy92YXJsdgp4ZnNfZ3Jvd2ZzIC92YXIKCmx2ZXh0ZW5kIC1sICsxMDAlRlJFRSAvZGV2L3Jvb3R2Zy9ob21lbHYKeGZzX2dyb3dmcyAvaG9tZQoKcnBtIC0taW1wb3J0IGh0dHBzOi8vZGwuZmVkb3JhcHJvamVjdC5vcmcvcHViL2VwZWwvUlBNLUdQRy1LRVktRVBFTC03CnJwbSAtLWltcG9ydCBodHRwczovL3BhY2thZ2VzLm1pY3Jvc29mdC5jb20va2V5cy9taWNyb3NvZnQuYXNjCgp5dW0gLXkgaW5zdGFsbCBodHRwczovL2RsLmZlZG9yYXByb2plY3Qub3JnL3B1Yi9lcGVsL2VwZWwtcmVsZWFzZS1sYXRlc3QtNy5ub2FyY2gucnBtCgpjYXQgPi9ldGMveXVtLnJlcG9zLmQvYXp1cmUucmVwbyA8PCdFT0YnClthenVyZS1jbGldCm5hbWU9YXp1cmUtY2xpCmJhc2V1cmw9aHR0cHM6Ly9wYWNrYWdlcy5taWNyb3NvZnQuY29tL3l1bXJlcG9zL2F6dXJlLWNsaQplbmFibGVkPXllcwpncGdjaGVjaz15ZXMKRU9GCgp5dW0gLS1lbmFibGVyZXBvPXJodWktcmhlbC03LXNlcnZlci1yaHVpLW9wdGlvbmFsLXJwbXMgLXkgaW5zdGFsbCBhenVyZS1jbGkgZG9ja2VyIGpxIGdjYyByaC1naXQyOSByaC1weXRob24zNiB0bXB3YXRjaCBsdHRuZy11c3IKCkdPX1ZFUlNJT049MS4xNC45CmN1cmwgaHR0cHM6Ly9kbC5nb29nbGUuY29tL2dvL2dvJHtHT19WRVJTSU9OfS5saW51eC1hbWQ2NC50YXIuZ3ogfCB0YXIgLUMgL3Vzci9sb2NhbCAteHoKbG4gLXMgL3Vzci9sb2NhbC9nby9iaW4vKiAvdXNyL2xvY2FsL2JpbgoKVlNUU19BR0VOVF9WRVJTSU9OPTIuMTgxLjEKbWtkaXIgL2hvbWUvY2xvdWQtdXNlci9hZ2VudApwdXNoZCAvaG9tZS9jbG91ZC11c2VyL2FnZW50CmN1cmwgaHR0cHM6Ly92c3RzYWdlbnRwYWNrYWdlLmF6dXJlZWRnZS5uZXQvYWdlbnQvJHtWU1RTX0FHRU5UX1ZFUlNJT059L3ZzdHMtYWdlbnQtbGludXgteDY0LSR7VlNUU19BR0VOVF9WRVJTSU9OfS50YXIuZ3ogfCB0YXIgLXh6CmNob3duIC1SIGNsb3VkLXVzZXI6Y2xvdWQtdXNlciAuCgouL2Jpbi9pbnN0YWxsZGVwZW5kZW5jaWVzLnNoCnN1ZG8gLXUgY2xvdWQtdXNlciAuL2NvbmZpZy5zaCAtLXVuYXR0ZW5kZWQgLS11cmwgaHR0cHM6Ly9kZXYuYXp1cmUuY29tL21zYXp1cmUgLS1hdXRoIHBhdCAtLXRva2VuICIkQ0lBWlBUT0tFTiIgLS1wb29sICIkQ0lQT09MTkFNRSIgLS1hZ2VudCAiQVJPLVJIRUwtJEhPU1ROQU1FIiAtLXJlcGxhY2UKLi9zdmMuc2ggaW5zdGFsbCBjbG91ZC11c2VyCnBvcGQKCiMgbWVyZ2UgaW4gL29wdC9yaC9yaC0qL2VuYWJsZQpjYXQgPi9ob21lL2Nsb3VkLXVzZXIvYWdlbnQvLnBhdGggPDwnRU9GJwovb3B0L3JoL3JoLXB5dGhvbjM2L3Jvb3QvdXNyL2Jpbjovb3B0L3JoL3JoLWdpdDI5L3Jvb3QvdXNyL2JpbjovdXNyL2xvY2FsL2JpbjovdXNyL2JpbjovdXNyL2xvY2FsL3NiaW46L3Vzci9zYmluOi9ob21lL2Nsb3VkLXVzZXIvLmxvY2FsL2JpbjovaG9tZS9jbG91ZC11c2VyL2JpbgpFT0YKCmNhdCA+L2hvbWUvY2xvdWQtdXNlci9hZ2VudC8uZW52IDw8J0VPRicKTERfTElCUkFSWV9QQVRIPS9vcHQvcmgvcmgtcHl0aG9uMzYvcm9vdC91c3IvbGliNjQ6L29wdC9yaC9odHRwZDI0L3Jvb3QvdXNyL2xpYjY0Ck1BTlBBVEg9L29wdC9yaC9yaC1weXRob24zNi9yb290L3Vzci9zaGFyZS9tYW46L29wdC9yaC9yaC1naXQyOS9yb290L3Vzci9zaGFyZS9tYW4KUEVSTDVMSUI9L29wdC9yaC9yaC1naXQyOS9yb290L3Vzci9zaGFyZS9wZXJsNS92ZW5kb3JfcGVybApQS0dfQ09ORklHX1BBVEg9L29wdC9yaC9yaC1weXRob24zNi9yb290L3Vzci9saWI2NC9wa2djb25maWcKWERHX0RBVEFfRElSUz0vb3B0L3JoL3JoLXB5dGhvbjM2L3Jvb3QvdXNyL3NoYXJlOi91c3IvbG9jYWwvc2hhcmU6L3Vzci9zaGFyZQpFT0YKCnNlZCAtaSAtZSAncy9eT1BUSU9OUz0nXCcnL09QVElPTlM9J1wnJy1HIGNsb3VkLXVzZXIgLycgL2V0Yy9zeXNjb25maWcvZG9ja2VyCgpzeXN0ZW1jdGwgZW5hYmxlIGRvY2tlcgoKY2F0ID4vZXRjL2Nyb24uaG91cmx5L3RtcHdhdGNoIDw8J0VPRicKIyEvYmluL2Jhc2gKCmV4ZWMgL3NiaW4vdG1wd2F0Y2ggMjRoIC90bXAKRU9GCmNobW9kICt4IC9ldGMvY3Jvbi5ob3VybHkvdG1wd2F0Y2gKCihzbGVlcCAzMDsgcmVib290KSAmCg==')))]"
|
||||
"script": "[base64(concat(base64ToString('c2V0IC1lCgo='),'CIAZPTOKEN=''',parameters('ciAzpToken'),'''\n','CIPOOLNAME=''',parameters('ciPoolName'),'''\n','\n',base64ToString('CiMgLS1kaXNhYmxlcmVwbz0qIC0tZW5hYmxlcmVwbz0iKm1pY3Jvc29mdCoiIGJlZW4gYWRkZWQgdG8gd29ya2Fyb3VuZCBleHBpcmVkIGNsaWVudCBwYWNrYWdlIGlzc3VlCnl1bSAteSB1cGRhdGUgLXggV0FMaW51eEFnZW50IC0tZGlzYWJsZXJlcG89KiAtLWVuYWJsZXJlcG89IiptaWNyb3NvZnQqIgoKbHZleHRlbmQgLWwgKzUwJUZSRUUgL2Rldi9yb290dmcvdmFybHYKeGZzX2dyb3dmcyAvdmFyCgpsdmV4dGVuZCAtbCArMTAwJUZSRUUgL2Rldi9yb290dmcvaG9tZWx2Cnhmc19ncm93ZnMgL2hvbWUKCnJwbSAtLWltcG9ydCBodHRwczovL2RsLmZlZG9yYXByb2plY3Qub3JnL3B1Yi9lcGVsL1JQTS1HUEctS0VZLUVQRUwtNwpycG0gLS1pbXBvcnQgaHR0cHM6Ly9wYWNrYWdlcy5taWNyb3NvZnQuY29tL2tleXMvbWljcm9zb2Z0LmFzYwoKeXVtIC15IGluc3RhbGwgaHR0cHM6Ly9kbC5mZWRvcmFwcm9qZWN0Lm9yZy9wdWIvZXBlbC9lcGVsLXJlbGVhc2UtbGF0ZXN0LTcubm9hcmNoLnJwbQoKY2F0ID4vZXRjL3l1bS5yZXBvcy5kL2F6dXJlLnJlcG8gPDwnRU9GJwpbYXp1cmUtY2xpXQpuYW1lPWF6dXJlLWNsaQpiYXNldXJsPWh0dHBzOi8vcGFja2FnZXMubWljcm9zb2Z0LmNvbS95dW1yZXBvcy9henVyZS1jbGkKZW5hYmxlZD15ZXMKZ3BnY2hlY2s9eWVzCkVPRgoKeXVtIC0tZW5hYmxlcmVwbz1yaHVpLXJoZWwtNy1zZXJ2ZXItcmh1aS1vcHRpb25hbC1ycG1zIC15IGluc3RhbGwgYXp1cmUtY2xpIGRvY2tlciBqcSBnY2MgcmgtZ2l0MjkgcmgtcHl0aG9uMzYgdG1wd2F0Y2ggbHR0bmctdXNyCgpHT19WRVJTSU9OPTEuMTQuOQpjdXJsIGh0dHBzOi8vZGwuZ29vZ2xlLmNvbS9nby9nbyR7R09fVkVSU0lPTn0ubGludXgtYW1kNjQudGFyLmd6IHwgdGFyIC1DIC91c3IvbG9jYWwgLXh6CmxuIC1zIC91c3IvbG9jYWwvZ28vYmluLyogL3Vzci9sb2NhbC9iaW4KClZTVFNfQUdFTlRfVkVSU0lPTj0yLjE4MS4xCm1rZGlyIC9ob21lL2Nsb3VkLXVzZXIvYWdlbnQKcHVzaGQgL2hvbWUvY2xvdWQtdXNlci9hZ2VudApjdXJsIGh0dHBzOi8vdnN0c2FnZW50cGFja2FnZS5henVyZWVkZ2UubmV0L2FnZW50LyR7VlNUU19BR0VOVF9WRVJTSU9OfS92c3RzLWFnZW50LWxpbnV4LXg2NC0ke1ZTVFNfQUdFTlRfVkVSU0lPTn0udGFyLmd6IHwgdGFyIC14egpjaG93biAtUiBjbG91ZC11c2VyOmNsb3VkLXVzZXIgLgoKLi9iaW4vaW5zdGFsbGRlcGVuZGVuY2llcy5zaApzdWRvIC11IGNsb3VkLXVzZXIgLi9jb25maWcuc2ggLS11bmF0dGVuZGVkIC0tdXJsIGh0dHBzOi8vZGV2LmF6dXJlLmNvbS9tc2F6dXJlIC0tYXV0aCBwYXQgLS10b2tlbiAiJENJQVpQVE9LRU4iIC0tcG9vbCAiJENJUE9PTE5BTUUiIC0tYWdlbnQgIkFSTy1SSEVMLSRIT1NUTkFNRSIgLS1yZXBsYWNlCi4vc3ZjLnNoIGluc3RhbGwgY2xvdWQtdXNlcgpwb3BkCgojIG1lcmdlIGluIC9vcHQvcmgvcmgtKi9lbmFibGUKY2F0ID4vaG9tZS9jbG91ZC11c2VyL2FnZW50Ly5wYXRoIDw8J0VPRicKL29wdC9yaC9yaC1weXRob24zNi9yb290L3Vzci9iaW46L29wdC9yaC9yaC1naXQyOS9yb290L3Vzci9iaW46L3Vzci9sb2NhbC9iaW46L3Vzci9iaW46L3Vzci9sb2NhbC9zYmluOi91c3Ivc2JpbjovaG9tZS9jbG91ZC11c2VyLy5sb2NhbC9iaW46L2hvbWUvY2xvdWQtdXNlci9iaW4KRU9GCgpjYXQgPi9ob21lL2Nsb3VkLXVzZXIvYWdlbnQvLmVudiA8PCdFT0YnCkxEX0xJQlJBUllfUEFUSD0vb3B0L3JoL3JoLXB5dGhvbjM2L3Jvb3QvdXNyL2xpYjY0Oi9vcHQvcmgvaHR0cGQyNC9yb290L3Vzci9saWI2NApNQU5QQVRIPS9vcHQvcmgvcmgtcHl0aG9uMzYvcm9vdC91c3Ivc2hhcmUvbWFuOi9vcHQvcmgvcmgtZ2l0Mjkvcm9vdC91c3Ivc2hhcmUvbWFuClBFUkw1TElCPS9vcHQvcmgvcmgtZ2l0Mjkvcm9vdC91c3Ivc2hhcmUvcGVybDUvdmVuZG9yX3BlcmwKUEtHX0NPTkZJR19QQVRIPS9vcHQvcmgvcmgtcHl0aG9uMzYvcm9vdC91c3IvbGliNjQvcGtnY29uZmlnClhER19EQVRBX0RJUlM9L29wdC9yaC9yaC1weXRob24zNi9yb290L3Vzci9zaGFyZTovdXNyL2xvY2FsL3NoYXJlOi91c3Ivc2hhcmUKRU9GCgpzZWQgLWkgLWUgJ3MvXk9QVElPTlM9J1wnJy9PUFRJT05TPSdcJyctRyBjbG91ZC11c2VyIC8nIC9ldGMvc3lzY29uZmlnL2RvY2tlcgoKc3lzdGVtY3RsIGVuYWJsZSBkb2NrZXIKCmNhdCA+L2V0Yy9jcm9uLmhvdXJseS90bXB3YXRjaCA8PCdFT0YnCiMhL2Jpbi9iYXNoCgpleGVjIC9zYmluL3RtcHdhdGNoIDI0aCAvdG1wCkVPRgpjaG1vZCAreCAvZXRjL2Nyb24uaG91cmx5L3RtcHdhdGNoCgooc2xlZXAgMzA7IHJlYm9vdCkgJgo=')))]"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Различия файлов скрыты, потому что одна или несколько строк слишком длинны
Различия файлов скрыты, потому что одна или несколько строк слишком длинны
|
@ -297,7 +297,8 @@ func (g *generator) devCIPool() *arm.Resource {
|
|||
}
|
||||
|
||||
trailer := base64.StdEncoding.EncodeToString([]byte(`
|
||||
yum -y update -x WALinuxAgent
|
||||
# --disablerepo=* --enablerepo="*microsoft*" been added to workaround expired client package issue
|
||||
yum -y update -x WALinuxAgent --disablerepo=* --enablerepo="*microsoft*"
|
||||
|
||||
lvextend -l +50%FREE /dev/rootvg/varlv
|
||||
xfs_growfs /var
|
||||
|
|
|
@ -437,7 +437,8 @@ func (g *generator) rpVMSS() *arm.Resource {
|
|||
)
|
||||
|
||||
trailer := base64.StdEncoding.EncodeToString([]byte(`
|
||||
yum -y update -x WALinuxAgent
|
||||
# --disablerepo=* --enablerepo="*microsoft*" been added to workaround expired client package issue
|
||||
yum -y update -x WALinuxAgent --disablerepo=* --enablerepo="*microsoft*"
|
||||
|
||||
lvextend -l +50%FREE /dev/rootvg/rootlv
|
||||
xfs_growfs /
|
||||
|
|
Загрузка…
Ссылка в новой задаче