Azure
/
ARO-RP
зеркало из https://github.com/Azure/ARO-RP.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

enable time sync for RP VMs

This commit is contained in:
Jim Minter 2020-01-06 15:53:35 -06:00
Родитель b39190ab4d
Коммит 34b56b9ac8
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 0730CBDA10D1A2D3
2 изменённых файлов: 2 добавлений и 1 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
deploy/rp-production.json
Просмотреть файл

@ -208,7 +208,7 @@
"autoUpgradeMinorVersion": true,
"settings": {},
"protectedSettings": {
"script": "[base64(concat(base64ToString('c2V0IC1leAoK'),'PULLSECRET=$(base64 -d \u003c\u003c\u003c''',base64(parameters('pullSecret')),''')\n','RPIMAGE=$(base64 -d \u003c\u003c\u003c''',base64(parameters('rpImage')),''')\n','RPIMAGEAUTH=$(base64 -d \u003c\u003c\u003c''',base64(parameters('rpImageAuth')),''')\n','\n',base64ToString('c3lzdGVtY3RsIHN0b3AgYXJvcnAuc2VydmljZSB8fCB0cnVlCgp5dW0gLXkgdXBkYXRlIC14IFdBTGludXhBZ2VudAoKcnBtIC0taW1wb3J0IGh0dHBzOi8vZGwuZmVkb3JhcHJvamVjdC5vcmcvcHViL2VwZWwvUlBNLUdQRy1LRVktRVBFTC03Cgp5dW0gLXkgaW5zdGFsbCBodHRwczovL2RsLmZlZG9yYXByb2plY3Qub3JnL3B1Yi9lcGVsL2VwZWwtcmVsZWFzZS1sYXRlc3QtNy5ub2FyY2gucnBtIHx8IHRydWUKCmNhdCA+L2V0Yy95dW0ucmVwb3MuZC9henVyZS1jbGkucmVwbyA8PCdFT0YnClthenVyZWNvcmVdCm5hbWU9YXp1cmVjb3JlCmJhc2V1cmw9aHR0cHM6Ly9wYWNrYWdlcy5taWNyb3NvZnQuY29tL3l1bXJlcG9zL2F6dXJlY29yZQplbmFibGVkPXllcwpncGdjaGVjaz1ubwpFT0YKCnl1bSAteSBpbnN0YWxsIGF6c2VjLWNsYW1hdiBhenNlYy1tb25pdG9yIGF6dXJlLW1kc2QgYXp1cmUtc2VjdXJpdHkgZG9ja2VyCgpmaXJld2FsbC1jbWQgLS1hZGQtcG9ydD00NDMvdGNwIC0tcGVybWFuZW50CgppZiBbWyAtbiAiJFJQSU1BR0VBVVRIIiBdXTsgdGhlbgogIG1rZGlyIC1wIC9yb290Ly5kb2NrZXIKCiAgY2F0ID4vcm9vdC8uZG9ja2VyL2NvbmZpZy5qc29uIDw8RU9GCnsKCSJhdXRocyI6IHsKCQkiJHtSUElNQUdFJSUvKn0iOiB7CgkJCSJhdXRoIjogIiRSUElNQUdFQVVUSCIKCQl9Cgl9Cn0KRU9GCgplbHNlCiAgcm0gLXJmIC9yb290Ly5kb2NrZXIKZmkKCmNhdCA+L2V0Yy9zeXNjb25maWcvYXJvcnAgPDxFT0YKUlBfSU1BR0U9JyRSUElNQUdFJwpQVUxMX1NFQ1JFVD0nJFBVTExTRUNSRVQnCkVPRgoKY2F0ID4vZXRjL3N5c3RlbWQvc3lzdGVtL2Fyb3JwLnNlcnZpY2UgPDxFT0YKW1VuaXRdCkFmdGVyPWRvY2tlci5zZXJ2aWNlClJlcXVpcmVzPWRvY2tlci5zZXJ2aWNlCgpbU2VydmljZV0KRW52aXJvbm1lbnRGaWxlPS9ldGMvc3lzY29uZmlnL2Fyb3JwCkV4ZWNTdGFydFByZT0tL3Vzci9iaW4vZG9ja2VyIHJtIC1mICVuCkV4ZWNTdGFydFByZT0vdXNyL2Jpbi9kb2NrZXIgcHVsbCBcJFJQX0lNQUdFCkV4ZWNTdGFydD0vdXNyL2Jpbi9kb2NrZXIgcnVuIC0tcm0gLS1uYW1lICVuIC1wIDQ0Mzo4NDQzIC1lIFBVTExfU0VDUkVUIFwkUlBfSU1BR0UgcnAKRXhlY1N0b3A9L3Vzci9iaW4vZG9ja2VyIHN0b3AgLXQgOTAgJW4KUmVzdGFydD1hbHdheXMKCltJbnN0YWxsXQpXYW50ZWRCeT1tdWx0aS11c2VyLnRhcmdldApFT0YKCnN5c3RlbWN0bCBlbmFibGUgYXJvcnAuc2VydmljZQoKKHNsZWVwIDMwOyByZWJvb3QpICYK')))]"
"script": "[base64(concat(base64ToString('c2V0IC1leAoK'),'PULLSECRET=$(base64 -d \u003c\u003c\u003c''',base64(parameters('pullSecret')),''')\n','RPIMAGE=$(base64 -d \u003c\u003c\u003c''',base64(parameters('rpImage')),''')\n','RPIMAGEAUTH=$(base64 -d \u003c\u003c\u003c''',base64(parameters('rpImageAuth')),''')\n','\n',base64ToString('c3lzdGVtY3RsIHN0b3AgYXJvcnAuc2VydmljZSB8fCB0cnVlCgp5dW0gLXkgdXBkYXRlIC14IFdBTGludXhBZ2VudAoKcnBtIC0taW1wb3J0IGh0dHBzOi8vZGwuZmVkb3JhcHJvamVjdC5vcmcvcHViL2VwZWwvUlBNLUdQRy1LRVktRVBFTC03Cgp5dW0gLXkgaW5zdGFsbCBodHRwczovL2RsLmZlZG9yYXByb2plY3Qub3JnL3B1Yi9lcGVsL2VwZWwtcmVsZWFzZS1sYXRlc3QtNy5ub2FyY2gucnBtIHx8IHRydWUKCmNhdCA+L2V0Yy95dW0ucmVwb3MuZC9henVyZS1jbGkucmVwbyA8PCdFT0YnClthenVyZWNvcmVdCm5hbWU9YXp1cmVjb3JlCmJhc2V1cmw9aHR0cHM6Ly9wYWNrYWdlcy5taWNyb3NvZnQuY29tL3l1bXJlcG9zL2F6dXJlY29yZQplbmFibGVkPXllcwpncGdjaGVjaz1ubwpFT0YKCnl1bSAteSBpbnN0YWxsIGF6c2VjLWNsYW1hdiBhenNlYy1tb25pdG9yIGF6dXJlLW1kc2QgYXp1cmUtc2VjdXJpdHkgZG9ja2VyCgpmaXJld2FsbC1jbWQgLS1hZGQtcG9ydD00NDMvdGNwIC0tcGVybWFuZW50CgppZiBbWyAtbiAiJFJQSU1BR0VBVVRIIiBdXTsgdGhlbgogIG1rZGlyIC1wIC9yb290Ly5kb2NrZXIKCiAgY2F0ID4vcm9vdC8uZG9ja2VyL2NvbmZpZy5qc29uIDw8RU9GCnsKCSJhdXRocyI6IHsKCQkiJHtSUElNQUdFJSUvKn0iOiB7CgkJCSJhdXRoIjogIiRSUElNQUdFQVVUSCIKCQl9Cgl9Cn0KRU9GCgplbHNlCiAgcm0gLXJmIC9yb290Ly5kb2NrZXIKZmkKCmNhdCA+L2V0Yy9zeXNjb25maWcvYXJvcnAgPDxFT0YKUlBfSU1BR0U9JyRSUElNQUdFJwpQVUxMX1NFQ1JFVD0nJFBVTExTRUNSRVQnCkVPRgoKY2F0ID4vZXRjL3N5c3RlbWQvc3lzdGVtL2Fyb3JwLnNlcnZpY2UgPDxFT0YKW1VuaXRdCkFmdGVyPWRvY2tlci5zZXJ2aWNlClJlcXVpcmVzPWRvY2tlci5zZXJ2aWNlCgpbU2VydmljZV0KRW52aXJvbm1lbnRGaWxlPS9ldGMvc3lzY29uZmlnL2Fyb3JwCkV4ZWNTdGFydFByZT0tL3Vzci9iaW4vZG9ja2VyIHJtIC1mICVuCkV4ZWNTdGFydFByZT0vdXNyL2Jpbi9kb2NrZXIgcHVsbCBcJFJQX0lNQUdFCkV4ZWNTdGFydD0vdXNyL2Jpbi9kb2NrZXIgcnVuIC0tcm0gLS1uYW1lICVuIC1wIDQ0Mzo4NDQzIC1lIFBVTExfU0VDUkVUIFwkUlBfSU1BR0UgcnAKRXhlY1N0b3A9L3Vzci9iaW4vZG9ja2VyIHN0b3AgLXQgOTAgJW4KUmVzdGFydD1hbHdheXMKCltJbnN0YWxsXQpXYW50ZWRCeT1tdWx0aS11c2VyLnRhcmdldApFT0YKCnN5c3RlbWN0bCBlbmFibGUgYXJvcnAuc2VydmljZQpzeXN0ZW1jdGwgZW5hYmxlIGNocm9ueWQuc2VydmljZQoKKHNsZWVwIDMwOyByZWJvb3QpICYK')))]"
}
}
}

1
pkg/deploy/rp.go
Просмотреть файл

@ -257,6 +257,7 @@ WantedBy=multi-user.target
EOF
systemctl enable arorp.service
systemctl enable chronyd.service
(sleep 30; reboot) &
`))