From e585c8ee125751893f979e57ef54287a10925005 Mon Sep 17 00:00:00 2001 From: Jim Minter Date: Mon, 24 Feb 2020 17:55:25 -0600 Subject: [PATCH] rename mdm*, mdsd* to rpMdm*, rpMdsd* --- deploy/rp-production-parameters.json | 54 +++++++++++------------ deploy/rp-production.json | 56 +++++++++++------------ pkg/deploy/rp.go | 66 ++++++++++++++-------------- 3 files changed, 88 insertions(+), 88 deletions(-) diff --git a/deploy/rp-production-parameters.json b/deploy/rp-production-parameters.json index 100c65dc3..18e5c177d 100644 --- a/deploy/rp-production-parameters.json +++ b/deploy/rp-production-parameters.json @@ -20,33 +20,6 @@ "keyvaultPrefix": { "value": "" }, - "mdmCertificateVaultId": { - "value": "" - }, - "mdmFrontendUrl": { - "value": "" - }, - "mdmMetricNamespace": { - "value": "" - }, - "mdmMonitoringAccount": { - "value": "" - }, - "mdsdAccount": { - "value": "" - }, - "mdsdCertificateVaultId": { - "value": "" - }, - "mdsdConfigVersion": { - "value": "" - }, - "mdsdEnvironment": { - "value": "" - }, - "mdsdNamespace": { - "value": "" - }, "pullSecret": { "value": "" }, @@ -56,6 +29,33 @@ "rpImageAuth": { "value": "" }, + "rpMdmCertificateVaultId": { + "value": "" + }, + "rpMdmFrontendUrl": { + "value": "" + }, + "rpMdmMetricNamespace": { + "value": "" + }, + "rpMdmMonitoringAccount": { + "value": "" + }, + "rpMdsdAccount": { + "value": "" + }, + "rpMdsdCertificateVaultId": { + "value": "" + }, + "rpMdsdConfigVersion": { + "value": "" + }, + "rpMdsdEnvironment": { + "value": "" + }, + "rpMdsdNamespace": { + "value": "" + }, "rpMode": { "value": "" }, diff --git a/deploy/rp-production.json b/deploy/rp-production.json index 0de52f852..c7dd28c7a 100644 --- a/deploy/rp-production.json +++ b/deploy/rp-production.json @@ -51,33 +51,6 @@ "type": "string", "maxLength": 20 }, - "mdmCertificateVaultId": { - "type": "string" - }, - "mdmFrontendUrl": { - "type": "string" - }, - "mdmMetricNamespace": { - "type": "string" - }, - "mdmMonitoringAccount": { - "type": "string" - }, - "mdsdAccount": { - "type": "string" - }, - "mdsdCertificateVaultId": { - "type": "string" - }, - "mdsdConfigVersion": { - "type": "string" - }, - "mdsdEnvironment": { - "type": "string" - }, - "mdsdNamespace": { - "type": "string" - }, "pullSecret": { "type": "securestring" }, @@ -87,6 +60,33 @@ "rpImageAuth": { "type": "securestring" }, + "rpMdmCertificateVaultId": { + "type": "string" + }, + "rpMdmFrontendUrl": { + "type": "string" + }, + "rpMdmMetricNamespace": { + "type": "string" + }, + "rpMdmMonitoringAccount": { + "type": "string" + }, + "rpMdsdAccount": { + "type": "string" + }, + "rpMdsdCertificateVaultId": { + "type": "string" + }, + "rpMdsdConfigVersion": { + "type": "string" + }, + "rpMdsdEnvironment": { + "type": "string" + }, + "rpMdsdNamespace": { + "type": "string" + }, "rpMode": { "type": "string", "defaultValue": "" @@ -270,7 +270,7 @@ "autoUpgradeMinorVersion": true, "settings": {}, "protectedSettings": { - "script": "[base64(concat(base64ToString('c2V0IC1leAoK'),'MDMCERTIFICATEVAULTID=$(base64 -d \u003c\u003c\u003c''',base64(parameters('mdmCertificateVaultId')),''')\n','MDMFRONTENDURL=$(base64 -d \u003c\u003c\u003c''',base64(parameters('mdmFrontendUrl')),''')\n','MDMMETRICNAMESPACE=$(base64 -d \u003c\u003c\u003c''',base64(parameters('mdmMetricNamespace')),''')\n','MDMMONITORINGACCOUNT=$(base64 -d \u003c\u003c\u003c''',base64(parameters('mdmMonitoringAccount')),''')\n','MDSDACCOUNT=$(base64 -d \u003c\u003c\u003c''',base64(parameters('mdsdAccount')),''')\n','MDSDCERTIFICATEVAULTID=$(base64 -d \u003c\u003c\u003c''',base64(parameters('mdsdCertificateVaultId')),''')\n','MDSDCONFIGVERSION=$(base64 -d \u003c\u003c\u003c''',base64(parameters('mdsdConfigVersion')),''')\n','MDSDENVIRONMENT=$(base64 -d \u003c\u003c\u003c''',base64(parameters('mdsdEnvironment')),''')\n','MDSDNAMESPACE=$(base64 -d \u003c\u003c\u003c''',base64(parameters('mdsdNamespace')),''')\n','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','RPMODE=$(base64 -d \u003c\u003c\u003c''',base64(parameters('rpMode')),''')\n','LOCATION=$(base64 -d \u003c\u003c\u003c''',base64(resourceGroup().location),''')\n','\n',base64ToString('eXVtIC15IHVwZGF0ZSAteCBXQUxpbnV4QWdlbnQKCnJwbSAtLWltcG9ydCBodHRwczovL2RsLmZlZG9yYXByb2plY3Qub3JnL3B1Yi9lcGVsL1JQTS1HUEctS0VZLUVQRUwtOApycG0gLS1pbXBvcnQgaHR0cHM6Ly9wYWNrYWdlcy5taWNyb3NvZnQuY29tL2tleXMvbWljcm9zb2Z0LmFzYwpycG0gLS1pbXBvcnQgaHR0cHM6Ly9wYWNrYWdlcy5mbHVlbnRiaXQuaW8vZmx1ZW50Yml0LmtleQoKeXVtIC15IGluc3RhbGwgaHR0cHM6Ly9kbC5mZWRvcmFwcm9qZWN0Lm9yZy9wdWIvZXBlbC9lcGVsLXJlbGVhc2UtbGF0ZXN0LTgubm9hcmNoLnJwbQoKY2F0ID4vZXRjL3l1bS5yZXBvcy5kL2F6dXJlLnJlcG8gPDwnRU9GJwpbYXp1cmUtY2xpXQpuYW1lPWF6dXJlLWNsaQpiYXNldXJsPWh0dHBzOi8vcGFja2FnZXMubWljcm9zb2Z0LmNvbS95dW1yZXBvcy9henVyZS1jbGkKZW5hYmxlZD15ZXMKZ3BnY2hlY2s9eWVzCgpbYXp1cmVjb3JlXQpuYW1lPWF6dXJlY29yZQpiYXNldXJsPWh0dHBzOi8vcGFja2FnZXMubWljcm9zb2Z0LmNvbS95dW1yZXBvcy9henVyZWNvcmUKZW5hYmxlZD15ZXMKZ3BnY2hlY2s9bm8KRU9GCgpjYXQgPi9ldGMveXVtLnJlcG9zLmQvdGQtYWdlbnQtYml0LnJlcG8gPDwnRU9GJwpbdGQtYWdlbnQtYml0XQpuYW1lPXRkLWFnZW50LWJpdApiYXNldXJsPWh0dHBzOi8vcGFja2FnZXMuZmx1ZW50Yml0LmlvL2NlbnRvcy83CmVuYWJsZWQ9eWVzCmdwZ2NoZWNrPXllcwpFT0YKCnl1bSAteSBpbnN0YWxsIGF6c2VjLWNsYW1hdiBhenNlYy1tb25pdG9yIGF6dXJlLWNsaSBhenVyZS1tZHNkIGF6dXJlLXNlY3VyaXR5IHBvZG1hbi1kb2NrZXIgdGQtYWdlbnQtYml0CgpmaXJld2FsbC1jbWQgLS1hZGQtcG9ydD00NDMvdGNwIC0tcGVybWFuZW50CgojIGh0dHBzOi8vYnVnemlsbGEucmVkaGF0LmNvbS9zaG93X2J1Zy5jZ2k/aWQ9MTgwNTIxMgpzZWQgLWkgLWUgJ3MvaXB0YWJsZXMvZmlyZXdhbGxkLycgL2V0Yy9jbmkvbmV0LmQvODctcG9kbWFuLWJyaWRnZS5jb25mbGlzdAoKY2F0ID4vcm9vdC8uZG9ja2VyL2NvbmZpZy5qc29uIDw8RU9GCnsKCSJhdXRocyI6IHsKCQkiJHtSUElNQUdFJSUvKn0iOiB7CgkJCSJhdXRoIjogIiRSUElNQUdFQVVUSCIKCQl9Cgl9Cn0KRU9GCgpjYXQgPi9ldGMvdGQtYWdlbnQtYml0L3RkLWFnZW50LWJpdC5jb25mIDw8J0VPRicKW0lOUFVUXQogICAgTmFtZSBzeXN0ZW1kCiAgICBUYWcgam91cm5hbGQKCltPVVRQVVRdCiAgICBOYW1lIGZvcndhcmQKICAgIFBvcnQgMjkyMzAKRU9GCgpheiBsb2dpbiAtaSAtLWFsbG93LW5vLXN1YnNjcmlwdGlvbnMKCmF6IGtleXZhdWx0IHNlY3JldCBkb3dubG9hZCAtLWZpbGUgL2V0Yy9tZG0ucGVtIC0taWQgIiRNRE1DRVJUSUZJQ0FURVZBVUxUSUQiCmNobW9kIDA2MDAgL2V0Yy9tZG0ucGVtCgpheiBrZXl2YXVsdCBzZWNyZXQgZG93bmxvYWQgLS1maWxlIC9ldGMvbWRzZC5wZW0gLS1pZCAiJE1EU0RDRVJUSUZJQ0FURVZBVUxUSUQiCmNob3duIHN5c2xvZzpzeXNsb2cgL2V0Yy9tZHNkLnBlbQpjaG1vZCAwNjAwIC9ldGMvbWRzZC5wZW0KCmF6IGxvZ291dAoKY2F0ID4vZXRjL2RlZmF1bHQvbWRzZCA8PEVPRgpNRFNEX1JPTEVfUFJFRklYPS92YXIvcnVuL21kc2QvZGVmYXVsdApNRFNEX09QVElPTlM9Ii1BIC1kIC1yIFwkTURTRF9ST0xFX1BSRUZJWCIKCmV4cG9ydCBTU0xfQ0VSVF9GSUxFPS9ldGMvcGtpL3Rscy9jZXJ0cy9jYS1idW5kbGUuY3J0CgpleHBvcnQgTU9OSVRPUklOR19HQ1NfRU5WSVJPTk1FTlQ9JyRNRFNERU5WSVJPTk1FTlQnCmV4cG9ydCBNT05JVE9SSU5HX0dDU19BQ0NPVU5UPSckTURTREFDQ09VTlQnCmV4cG9ydCBNT05JVE9SSU5HX0dDU19SRUdJT049JyRMT0NBVElPTicKZXhwb3J0IE1PTklUT1JJTkdfR0NTX0NFUlRfQ0VSVEZJTEU9L2V0Yy9tZHNkLnBlbQpleHBvcnQgTU9OSVRPUklOR19HQ1NfQ0VSVF9LRVlGSUxFPS9ldGMvbWRzZC5wZW0KZXhwb3J0IE1PTklUT1JJTkdfR0NTX05BTUVTUEFDRT0nJE1EU0ROQU1FU1BBQ0UnCmV4cG9ydCBNT05JVE9SSU5HX0NPTkZJR19WRVJTSU9OPSckTURTRENPTkZJR1ZFUlNJT04nCmV4cG9ydCBNT05JVE9SSU5HX1VTRV9HRU5FVkFfQ09ORklHX1NFUlZJQ0U9dHJ1ZQoKZXhwb3J0IE1PTklUT1JJTkdfVEVOQU5UPSckTE9DQVRJT04nCmV4cG9ydCBNT05JVE9SSU5HX1JPTEU9cnAKZXhwb3J0IE1PTklUT1JJTkdfUk9MRV9JTlNUQU5DRT0nJChob3N0bmFtZSknCkVPRgoKY2F0ID4vZXRjL3N5c2NvbmZpZy9tZG0gPDxFT0YKTURNRlJPTlRFTkRVUkw9JyRNRE1GUk9OVEVORFVSTCcKTURNSU1BR0U9YXJvc3ZjLmF6dXJlY3IuaW8vZ2VuZXZhbWRtOm1hc3Rlcl8zMQpNRE1NRVRSSUNOQU1FU1BBQ0U9JyRNRE1NRVRSSUNOQU1FU1BBQ0UnCk1ETU1PTklUT1JJTkdBQ0NPVU5UPSckTURNTU9OSVRPUklOR0FDQ09VTlQnCkVPRgoKY2F0ID4vZXRjL3N5c3RlbWQvc3lzdGVtL21kbS5zZXJ2aWNlIDw8J0VPRicKW1VuaXRdCkFmdGVyPW5ldHdvcmstb25saW5lLnRhcmdldAoKW1NlcnZpY2VdCkVudmlyb25tZW50RmlsZT0vZXRjL3N5c2NvbmZpZy9tZG0KRXhlY1N0YXJ0UHJlPS0vdXNyL2Jpbi9kb2NrZXIgcm0gLWYgJU4KRXhlY1N0YXJ0UHJlPS91c3IvYmluL2RvY2tlciBwdWxsICRNRE1JTUFHRQpFeGVjU3RhcnQ9L3Vzci9iaW4vZG9ja2VyIHJ1biBcCiAgLS1lbnRyeXBvaW50IC91c3Ivc2Jpbi9NZXRyaWNzRXh0ZW5zaW9uIFwKICAtLWhvc3RuYW1lICVIIFwKICAtLW5hbWUgJU4gXAogIC0tcm0gXAogIC12IC9ldGMvbWRtLnBlbTovZXRjL21kbS5wZW0gXAogIC12IC92YXIvZXR3Oi92YXIvZXR3IFwKICAkTURNSU1BR0UgXAogIC1Gcm9udEVuZFVybCAkTURNRlJPTlRFTkRVUkwgXAogIC1Nb25pdG9yaW5nQWNjb3VudCAkTURNTU9OSVRPUklOR0FDQ09VTlQgXAogIC1NZXRyaWNOYW1lc3BhY2UgJE1ETU1FVFJJQ05BTUVTUEFDRSBcCiAgLUNlcnRGaWxlIC9ldGMvbWRtLnBlbSBcCiAgLVByaXZhdGVLZXlGaWxlIC9ldGMvbWRtLnBlbQpFeGVjU3RvcD0vdXNyL2Jpbi9kb2NrZXIgc3RvcCAlTgpSZXN0YXJ0PWFsd2F5cwoKW0luc3RhbGxdCldhbnRlZEJ5PW11bHRpLXVzZXIudGFyZ2V0CkVPRgoKY2F0ID4vZXRjL3N5c2NvbmZpZy9hcm8gPDxFT0YKUFVMTF9TRUNSRVQ9JyRQVUxMU0VDUkVUJwpSUElNQUdFPSckUlBJTUFHRScKUlBfTU9ERT0nJFJQTU9ERScKRU9GCgpjYXQgPi9ldGMvc3lzdGVtZC9zeXN0ZW0vYXJvLXJwLnNlcnZpY2UgPDwnRU9GJwpbVW5pdF0KQWZ0ZXI9bmV0d29yay1vbmxpbmUudGFyZ2V0CgpbU2VydmljZV0KRW52aXJvbm1lbnRGaWxlPS9ldGMvc3lzY29uZmlnL2FybwpFeGVjU3RhcnRQcmU9LS91c3IvYmluL2RvY2tlciBybSAtZiAlTgpFeGVjU3RhcnRQcmU9L3Vzci9iaW4vZG9ja2VyIHB1bGwgJFJQSU1BR0UKRXhlY1N0YXJ0PS91c3IvYmluL2RvY2tlciBydW4gXAogIC0taG9zdG5hbWUgJUggXAogIC0tbmFtZSAlTiBcCiAgLS1ybSBcCiAgLWUgUFVMTF9TRUNSRVQgXAogIC1lIFJQX01PREUgXAogIC1wIDQ0Mzo4NDQzIFwKICAtdiAvcnVuL3N5c3RlbWQvam91cm5hbDovcnVuL3N5c3RlbWQvam91cm5hbCBcCiAgLXYgL3Zhci9ldHc6L3Zhci9ldHcgXAogICRSUElNQUdFIFwKICBycApFeGVjU3RvcD0vdXNyL2Jpbi9kb2NrZXIgc3RvcCAtdCAzNjAwICVOClJlc3RhcnQ9YWx3YXlzCgpbSW5zdGFsbF0KV2FudGVkQnk9bXVsdGktdXNlci50YXJnZXQKRU9GCgpjYXQgPi9ldGMvc3lzdGVtZC9zeXN0ZW0vYXJvLW1vbml0b3Iuc2VydmljZSA8PCdFT0YnCltVbml0XQpBZnRlcj1uZXR3b3JrLW9ubGluZS50YXJnZXQKCltTZXJ2aWNlXQpFbnZpcm9ubWVudEZpbGU9L2V0Yy9zeXNjb25maWcvYXJvCkV4ZWNTdGFydFByZT0tL3Vzci9iaW4vZG9ja2VyIHJtIC1mICVOCkV4ZWNTdGFydFByZT0vdXNyL2Jpbi9kb2NrZXIgcHVsbCAkUlBJTUFHRQpFeGVjU3RhcnQ9L3Vzci9iaW4vZG9ja2VyIHJ1biBcCiAgLS1ob3N0bmFtZSAlSCBcCiAgLS1uYW1lICVOIFwKICAtLXJtIFwKICAtZSBQVUxMX1NFQ1JFVCBcCiAgLWUgUlBfTU9ERSBcCiAgLXYgL3J1bi9zeXN0ZW1kL2pvdXJuYWw6L3J1bi9zeXN0ZW1kL2pvdXJuYWwgXAogIC12IC92YXIvZXR3Oi92YXIvZXR3IFwKICAkUlBJTUFHRSBcCiAgbW9uaXRvcgpSZXN0YXJ0PWFsd2F5cwoKW0luc3RhbGxdCldhbnRlZEJ5PW11bHRpLXVzZXIudGFyZ2V0CkVPRgoKZm9yIHNlcnZpY2UgaW4gYXJvLW1vbml0b3IgYXJvLXJwIGF1b21zIGF6c2VjZCBhenNlY21vbmQgbWRzZCBtZG0gY2hyb255ZCB0ZC1hZ2VudC1iaXQ7IGRvCiAgc3lzdGVtY3RsIGVuYWJsZSAkc2VydmljZS5zZXJ2aWNlCmRvbmUKCnJtIC9ldGMvbW90ZC5kLyoKPi9ldGMvY29udGFpbmVycy9ub2RvY2tlcgoKKHNsZWVwIDMwOyByZWJvb3QpICYK')))]" + "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','RPMDMCERTIFICATEVAULTID=$(base64 -d \u003c\u003c\u003c''',base64(parameters('rpMdmCertificateVaultId')),''')\n','RPMDMFRONTENDURL=$(base64 -d \u003c\u003c\u003c''',base64(parameters('rpMdmFrontendUrl')),''')\n','RPMDMMETRICNAMESPACE=$(base64 -d \u003c\u003c\u003c''',base64(parameters('rpMdmMetricNamespace')),''')\n','RPMDMMONITORINGACCOUNT=$(base64 -d \u003c\u003c\u003c''',base64(parameters('rpMdmMonitoringAccount')),''')\n','RPMDSDACCOUNT=$(base64 -d \u003c\u003c\u003c''',base64(parameters('rpMdsdAccount')),''')\n','RPMDSDCERTIFICATEVAULTID=$(base64 -d \u003c\u003c\u003c''',base64(parameters('rpMdsdCertificateVaultId')),''')\n','RPMDSDCONFIGVERSION=$(base64 -d \u003c\u003c\u003c''',base64(parameters('rpMdsdConfigVersion')),''')\n','RPMDSDENVIRONMENT=$(base64 -d \u003c\u003c\u003c''',base64(parameters('rpMdsdEnvironment')),''')\n','RPMDSDNAMESPACE=$(base64 -d \u003c\u003c\u003c''',base64(parameters('rpMdsdNamespace')),''')\n','RPMODE=$(base64 -d \u003c\u003c\u003c''',base64(parameters('rpMode')),''')\n','LOCATION=$(base64 -d \u003c\u003c\u003c''',base64(resourceGroup().location),''')\n','\n',base64ToString('eXVtIC15IHVwZGF0ZSAteCBXQUxpbnV4QWdlbnQKCnJwbSAtLWltcG9ydCBodHRwczovL2RsLmZlZG9yYXByb2plY3Qub3JnL3B1Yi9lcGVsL1JQTS1HUEctS0VZLUVQRUwtOApycG0gLS1pbXBvcnQgaHR0cHM6Ly9wYWNrYWdlcy5taWNyb3NvZnQuY29tL2tleXMvbWljcm9zb2Z0LmFzYwpycG0gLS1pbXBvcnQgaHR0cHM6Ly9wYWNrYWdlcy5mbHVlbnRiaXQuaW8vZmx1ZW50Yml0LmtleQoKeXVtIC15IGluc3RhbGwgaHR0cHM6Ly9kbC5mZWRvcmFwcm9qZWN0Lm9yZy9wdWIvZXBlbC9lcGVsLXJlbGVhc2UtbGF0ZXN0LTgubm9hcmNoLnJwbQoKY2F0ID4vZXRjL3l1bS5yZXBvcy5kL2F6dXJlLnJlcG8gPDwnRU9GJwpbYXp1cmUtY2xpXQpuYW1lPWF6dXJlLWNsaQpiYXNldXJsPWh0dHBzOi8vcGFja2FnZXMubWljcm9zb2Z0LmNvbS95dW1yZXBvcy9henVyZS1jbGkKZW5hYmxlZD15ZXMKZ3BnY2hlY2s9eWVzCgpbYXp1cmVjb3JlXQpuYW1lPWF6dXJlY29yZQpiYXNldXJsPWh0dHBzOi8vcGFja2FnZXMubWljcm9zb2Z0LmNvbS95dW1yZXBvcy9henVyZWNvcmUKZW5hYmxlZD15ZXMKZ3BnY2hlY2s9bm8KRU9GCgpjYXQgPi9ldGMveXVtLnJlcG9zLmQvdGQtYWdlbnQtYml0LnJlcG8gPDwnRU9GJwpbdGQtYWdlbnQtYml0XQpuYW1lPXRkLWFnZW50LWJpdApiYXNldXJsPWh0dHBzOi8vcGFja2FnZXMuZmx1ZW50Yml0LmlvL2NlbnRvcy83CmVuYWJsZWQ9eWVzCmdwZ2NoZWNrPXllcwpFT0YKCnl1bSAteSBpbnN0YWxsIGF6c2VjLWNsYW1hdiBhenNlYy1tb25pdG9yIGF6dXJlLWNsaSBhenVyZS1tZHNkIGF6dXJlLXNlY3VyaXR5IHBvZG1hbi1kb2NrZXIgdGQtYWdlbnQtYml0CgpmaXJld2FsbC1jbWQgLS1hZGQtcG9ydD00NDMvdGNwIC0tcGVybWFuZW50CgojIGh0dHBzOi8vYnVnemlsbGEucmVkaGF0LmNvbS9zaG93X2J1Zy5jZ2k/aWQ9MTgwNTIxMgpzZWQgLWkgLWUgJ3MvaXB0YWJsZXMvZmlyZXdhbGxkLycgL2V0Yy9jbmkvbmV0LmQvODctcG9kbWFuLWJyaWRnZS5jb25mbGlzdAoKY2F0ID4vcm9vdC8uZG9ja2VyL2NvbmZpZy5qc29uIDw8RU9GCnsKCSJhdXRocyI6IHsKCQkiJHtSUElNQUdFJSUvKn0iOiB7CgkJCSJhdXRoIjogIiRSUElNQUdFQVVUSCIKCQl9Cgl9Cn0KRU9GCgpjYXQgPi9ldGMvdGQtYWdlbnQtYml0L3RkLWFnZW50LWJpdC5jb25mIDw8J0VPRicKW0lOUFVUXQogICAgTmFtZSBzeXN0ZW1kCiAgICBUYWcgam91cm5hbGQKCltPVVRQVVRdCiAgICBOYW1lIGZvcndhcmQKICAgIFBvcnQgMjkyMzAKRU9GCgpheiBsb2dpbiAtaSAtLWFsbG93LW5vLXN1YnNjcmlwdGlvbnMKCmF6IGtleXZhdWx0IHNlY3JldCBkb3dubG9hZCAtLWZpbGUgL2V0Yy9tZG0ucGVtIC0taWQgIiRSUE1ETUNFUlRJRklDQVRFVkFVTFRJRCIKY2htb2QgMDYwMCAvZXRjL21kbS5wZW0KCmF6IGtleXZhdWx0IHNlY3JldCBkb3dubG9hZCAtLWZpbGUgL2V0Yy9tZHNkLnBlbSAtLWlkICIkUlBNRFNEQ0VSVElGSUNBVEVWQVVMVElEIgpjaG93biBzeXNsb2c6c3lzbG9nIC9ldGMvbWRzZC5wZW0KY2htb2QgMDYwMCAvZXRjL21kc2QucGVtCgpheiBsb2dvdXQKCmNhdCA+L2V0Yy9kZWZhdWx0L21kc2QgPDxFT0YKTURTRF9ST0xFX1BSRUZJWD0vdmFyL3J1bi9tZHNkL2RlZmF1bHQKTURTRF9PUFRJT05TPSItQSAtZCAtciBcJE1EU0RfUk9MRV9QUkVGSVgiCgpleHBvcnQgU1NMX0NFUlRfRklMRT0vZXRjL3BraS90bHMvY2VydHMvY2EtYnVuZGxlLmNydAoKZXhwb3J0IE1PTklUT1JJTkdfR0NTX0VOVklST05NRU5UPSckUlBNRFNERU5WSVJPTk1FTlQnCmV4cG9ydCBNT05JVE9SSU5HX0dDU19BQ0NPVU5UPSckUlBNRFNEQUNDT1VOVCcKZXhwb3J0IE1PTklUT1JJTkdfR0NTX1JFR0lPTj0nJExPQ0FUSU9OJwpleHBvcnQgTU9OSVRPUklOR19HQ1NfQ0VSVF9DRVJURklMRT0vZXRjL21kc2QucGVtCmV4cG9ydCBNT05JVE9SSU5HX0dDU19DRVJUX0tFWUZJTEU9L2V0Yy9tZHNkLnBlbQpleHBvcnQgTU9OSVRPUklOR19HQ1NfTkFNRVNQQUNFPSckUlBNRFNETkFNRVNQQUNFJwpleHBvcnQgTU9OSVRPUklOR19DT05GSUdfVkVSU0lPTj0nJFJQTURTRENPTkZJR1ZFUlNJT04nCmV4cG9ydCBNT05JVE9SSU5HX1VTRV9HRU5FVkFfQ09ORklHX1NFUlZJQ0U9dHJ1ZQoKZXhwb3J0IE1PTklUT1JJTkdfVEVOQU5UPSckTE9DQVRJT04nCmV4cG9ydCBNT05JVE9SSU5HX1JPTEU9cnAKZXhwb3J0IE1PTklUT1JJTkdfUk9MRV9JTlNUQU5DRT0nJChob3N0bmFtZSknCkVPRgoKY2F0ID4vZXRjL3N5c2NvbmZpZy9tZG0gPDxFT0YKUlBNRE1GUk9OVEVORFVSTD0nJFJQTURNRlJPTlRFTkRVUkwnClJQTURNSU1BR0U9YXJvc3ZjLmF6dXJlY3IuaW8vZ2VuZXZhbWRtOm1hc3Rlcl8zMQpSUE1ETU1FVFJJQ05BTUVTUEFDRT0nJFJQTURNTUVUUklDTkFNRVNQQUNFJwpSUE1ETU1PTklUT1JJTkdBQ0NPVU5UPSckUlBNRE1NT05JVE9SSU5HQUNDT1VOVCcKRU9GCgpjYXQgPi9ldGMvc3lzdGVtZC9zeXN0ZW0vbWRtLnNlcnZpY2UgPDwnRU9GJwpbVW5pdF0KQWZ0ZXI9bmV0d29yay1vbmxpbmUudGFyZ2V0CgpbU2VydmljZV0KRW52aXJvbm1lbnRGaWxlPS9ldGMvc3lzY29uZmlnL21kbQpFeGVjU3RhcnRQcmU9LS91c3IvYmluL2RvY2tlciBybSAtZiAlTgpFeGVjU3RhcnRQcmU9L3Vzci9iaW4vZG9ja2VyIHB1bGwgJFJQTURNSU1BR0UKRXhlY1N0YXJ0PS91c3IvYmluL2RvY2tlciBydW4gXAogIC0tZW50cnlwb2ludCAvdXNyL3NiaW4vTWV0cmljc0V4dGVuc2lvbiBcCiAgLS1ob3N0bmFtZSAlSCBcCiAgLS1uYW1lICVOIFwKICAtLXJtIFwKICAtdiAvZXRjL21kbS5wZW06L2V0Yy9tZG0ucGVtIFwKICAtdiAvdmFyL2V0dzovdmFyL2V0dyBcCiAgJFJQTURNSU1BR0UgXAogIC1Gcm9udEVuZFVybCAkUlBNRE1GUk9OVEVORFVSTCBcCiAgLU1vbml0b3JpbmdBY2NvdW50ICRSUE1ETU1PTklUT1JJTkdBQ0NPVU5UIFwKICAtTWV0cmljTmFtZXNwYWNlICRSUE1ETU1FVFJJQ05BTUVTUEFDRSBcCiAgLUNlcnRGaWxlIC9ldGMvbWRtLnBlbSBcCiAgLVByaXZhdGVLZXlGaWxlIC9ldGMvbWRtLnBlbQpFeGVjU3RvcD0vdXNyL2Jpbi9kb2NrZXIgc3RvcCAlTgpSZXN0YXJ0PWFsd2F5cwoKW0luc3RhbGxdCldhbnRlZEJ5PW11bHRpLXVzZXIudGFyZ2V0CkVPRgoKY2F0ID4vZXRjL3N5c2NvbmZpZy9hcm8gPDxFT0YKUFVMTF9TRUNSRVQ9JyRQVUxMU0VDUkVUJwpSUElNQUdFPSckUlBJTUFHRScKUlBfTU9ERT0nJFJQTU9ERScKRU9GCgpjYXQgPi9ldGMvc3lzdGVtZC9zeXN0ZW0vYXJvLXJwLnNlcnZpY2UgPDwnRU9GJwpbVW5pdF0KQWZ0ZXI9bmV0d29yay1vbmxpbmUudGFyZ2V0CgpbU2VydmljZV0KRW52aXJvbm1lbnRGaWxlPS9ldGMvc3lzY29uZmlnL2FybwpFeGVjU3RhcnRQcmU9LS91c3IvYmluL2RvY2tlciBybSAtZiAlTgpFeGVjU3RhcnRQcmU9L3Vzci9iaW4vZG9ja2VyIHB1bGwgJFJQSU1BR0UKRXhlY1N0YXJ0PS91c3IvYmluL2RvY2tlciBydW4gXAogIC0taG9zdG5hbWUgJUggXAogIC0tbmFtZSAlTiBcCiAgLS1ybSBcCiAgLWUgUFVMTF9TRUNSRVQgXAogIC1lIFJQX01PREUgXAogIC1wIDQ0Mzo4NDQzIFwKICAtdiAvcnVuL3N5c3RlbWQvam91cm5hbDovcnVuL3N5c3RlbWQvam91cm5hbCBcCiAgLXYgL3Zhci9ldHc6L3Zhci9ldHcgXAogICRSUElNQUdFIFwKICBycApFeGVjU3RvcD0vdXNyL2Jpbi9kb2NrZXIgc3RvcCAtdCAzNjAwICVOClJlc3RhcnQ9YWx3YXlzCgpbSW5zdGFsbF0KV2FudGVkQnk9bXVsdGktdXNlci50YXJnZXQKRU9GCgpjYXQgPi9ldGMvc3lzdGVtZC9zeXN0ZW0vYXJvLW1vbml0b3Iuc2VydmljZSA8PCdFT0YnCltVbml0XQpBZnRlcj1uZXR3b3JrLW9ubGluZS50YXJnZXQKCltTZXJ2aWNlXQpFbnZpcm9ubWVudEZpbGU9L2V0Yy9zeXNjb25maWcvYXJvCkV4ZWNTdGFydFByZT0tL3Vzci9iaW4vZG9ja2VyIHJtIC1mICVOCkV4ZWNTdGFydFByZT0vdXNyL2Jpbi9kb2NrZXIgcHVsbCAkUlBJTUFHRQpFeGVjU3RhcnQ9L3Vzci9iaW4vZG9ja2VyIHJ1biBcCiAgLS1ob3N0bmFtZSAlSCBcCiAgLS1uYW1lICVOIFwKICAtLXJtIFwKICAtZSBQVUxMX1NFQ1JFVCBcCiAgLWUgUlBfTU9ERSBcCiAgLXYgL3J1bi9zeXN0ZW1kL2pvdXJuYWw6L3J1bi9zeXN0ZW1kL2pvdXJuYWwgXAogIC12IC92YXIvZXR3Oi92YXIvZXR3IFwKICAkUlBJTUFHRSBcCiAgbW9uaXRvcgpSZXN0YXJ0PWFsd2F5cwoKW0luc3RhbGxdCldhbnRlZEJ5PW11bHRpLXVzZXIudGFyZ2V0CkVPRgoKZm9yIHNlcnZpY2UgaW4gYXJvLW1vbml0b3IgYXJvLXJwIGF1b21zIGF6c2VjZCBhenNlY21vbmQgbWRzZCBtZG0gY2hyb255ZCB0ZC1hZ2VudC1iaXQ7IGRvCiAgc3lzdGVtY3RsIGVuYWJsZSAkc2VydmljZS5zZXJ2aWNlCmRvbmUKCnJtIC9ldGMvbW90ZC5kLyoKPi9ldGMvY29udGFpbmVycy9ub2RvY2tlcgoKKHNsZWVwIDMwOyByZWJvb3QpICYK')))]" } } } diff --git a/pkg/deploy/rp.go b/pkg/deploy/rp.go index f978326d3..61bd2c97b 100644 --- a/pkg/deploy/rp.go +++ b/pkg/deploy/rp.go @@ -322,18 +322,18 @@ func (g *generator) vmss() *arm.Resource { } for _, variable := range []string{ - "mdmCertificateVaultId", - "mdmFrontendUrl", - "mdmMetricNamespace", - "mdmMonitoringAccount", - "mdsdAccount", - "mdsdCertificateVaultId", - "mdsdConfigVersion", - "mdsdEnvironment", - "mdsdNamespace", "pullSecret", "rpImage", "rpImageAuth", + "rpMdmCertificateVaultId", + "rpMdmFrontendUrl", + "rpMdmMetricNamespace", + "rpMdmMonitoringAccount", + "rpMdsdAccount", + "rpMdsdCertificateVaultId", + "rpMdsdConfigVersion", + "rpMdsdEnvironment", + "rpMdsdNamespace", "rpMode", } { parts = append(parts, @@ -408,10 +408,10 @@ EOF az login -i --allow-no-subscriptions -az keyvault secret download --file /etc/mdm.pem --id "$MDMCERTIFICATEVAULTID" +az keyvault secret download --file /etc/mdm.pem --id "$RPMDMCERTIFICATEVAULTID" chmod 0600 /etc/mdm.pem -az keyvault secret download --file /etc/mdsd.pem --id "$MDSDCERTIFICATEVAULTID" +az keyvault secret download --file /etc/mdsd.pem --id "$RPMDSDCERTIFICATEVAULTID" chown syslog:syslog /etc/mdsd.pem chmod 0600 /etc/mdsd.pem @@ -423,13 +423,13 @@ MDSD_OPTIONS="-A -d -r \$MDSD_ROLE_PREFIX" export SSL_CERT_FILE=/etc/pki/tls/certs/ca-bundle.crt -export MONITORING_GCS_ENVIRONMENT='$MDSDENVIRONMENT' -export MONITORING_GCS_ACCOUNT='$MDSDACCOUNT' +export MONITORING_GCS_ENVIRONMENT='$RPMDSDENVIRONMENT' +export MONITORING_GCS_ACCOUNT='$RPMDSDACCOUNT' export MONITORING_GCS_REGION='$LOCATION' export MONITORING_GCS_CERT_CERTFILE=/etc/mdsd.pem export MONITORING_GCS_CERT_KEYFILE=/etc/mdsd.pem -export MONITORING_GCS_NAMESPACE='$MDSDNAMESPACE' -export MONITORING_CONFIG_VERSION='$MDSDCONFIGVERSION' +export MONITORING_GCS_NAMESPACE='$RPMDSDNAMESPACE' +export MONITORING_CONFIG_VERSION='$RPMDSDCONFIGVERSION' export MONITORING_USE_GENEVA_CONFIG_SERVICE=true export MONITORING_TENANT='$LOCATION' @@ -438,10 +438,10 @@ export MONITORING_ROLE_INSTANCE='$(hostname)' EOF cat >/etc/sysconfig/mdm </etc/systemd/system/mdm.service <<'EOF' @@ -451,7 +451,7 @@ After=network-online.target [Service] EnvironmentFile=/etc/sysconfig/mdm ExecStartPre=-/usr/bin/docker rm -f %N -ExecStartPre=/usr/bin/docker pull $MDMIMAGE +ExecStartPre=/usr/bin/docker pull $RPMDMIMAGE ExecStart=/usr/bin/docker run \ --entrypoint /usr/sbin/MetricsExtension \ --hostname %H \ @@ -459,10 +459,10 @@ ExecStart=/usr/bin/docker run \ --rm \ -v /etc/mdm.pem:/etc/mdm.pem \ -v /var/etw:/var/etw \ - $MDMIMAGE \ - -FrontEndUrl $MDMFRONTENDURL \ - -MonitoringAccount $MDMMONITORINGACCOUNT \ - -MetricNamespace $MDMMETRICNAMESPACE \ + $RPMDMIMAGE \ + -FrontEndUrl $RPMDMFRONTENDURL \ + -MonitoringAccount $RPMDMMONITORINGACCOUNT \ + -MetricNamespace $RPMDMMETRICNAMESPACE \ -CertFile /etc/mdm.pem \ -PrivateKeyFile /etc/mdm.pem ExecStop=/usr/bin/docker stop %N @@ -1071,18 +1071,18 @@ func (g *generator) template() *arm.Template { params = append(params, "extraCosmosDBIPs", "extraKeyvaultAccessPolicies", - "mdmCertificateVaultId", - "mdmFrontendUrl", - "mdmMetricNamespace", - "mdmMonitoringAccount", - "mdsdAccount", - "mdsdCertificateVaultId", - "mdsdConfigVersion", - "mdsdEnvironment", - "mdsdNamespace", "pullSecret", "rpImage", "rpImageAuth", + "rpMdmCertificateVaultId", + "rpMdmFrontendUrl", + "rpMdmMetricNamespace", + "rpMdmMonitoringAccount", + "rpMdsdAccount", + "rpMdsdCertificateVaultId", + "rpMdsdConfigVersion", + "rpMdsdEnvironment", + "rpMdsdNamespace", "rpMode", "vmssCount", "vmssDomainNameLabel",