Skip to content

Commit 57ff069

Browse files
authored
Update identity parameters (#32)
* Update identity parameters * Change some default values
1 parent e5f9950 commit 57ff069

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

solution_template/VM-password.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"outputs": {
55
"identity": {
66
"type": "object",
7-
"value": "[reference(concat(resourceId('Microsoft.Compute/virtualMachines', parameters('vmName')), '/providers/Microsoft.ManagedIdentity/Identities/default'), '2015-08-31-PREVIEW')]"
7+
"value": "[reference(resourceId('Microsoft.Compute/virtualMachines', parameters('vmName')), '2017-12-01', 'Full').identity]"
88
}
99
},
1010
"parameters": {

solution_template/VM-sshPublicKey.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"outputs": {
55
"identity": {
66
"type": "object",
7-
"value": "[reference(concat(resourceId('Microsoft.Compute/virtualMachines', parameters('vmName')), '/providers/Microsoft.ManagedIdentity/Identities/default'), '2015-08-31-PREVIEW')]"
7+
"value": "[reference(resourceId('Microsoft.Compute/virtualMachines', parameters('vmName')), '2017-12-01', 'Full').identity]"
88
}
99
},
1010
"parameters": {

solution_template/createUiDefinition.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@
371371
"name": "artifactContainer",
372372
"type": "Microsoft.Common.TextBox",
373373
"label": "Container Name",
374-
"defaultValue": "artifacts",
374+
"defaultValue": "jenkins",
375375
"toolTip": "The blob container name used for your artifacts storage.",
376376
"constraints": {
377377
"required": true
@@ -382,7 +382,7 @@
382382
"name": "artifactPrefix",
383383
"type": "Microsoft.Common.TextBox",
384384
"label": "Base Prefix",
385-
"defaultValue": "azure/",
385+
"defaultValue": "default/",
386386
"toolTip": "String which will be used as prefix for every file path, if it ends with an '/', it will represent a folder.",
387387
"constraints": {
388388
"required": true

solution_template/scripts/install_jenkins.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ function run_util_script() {
4646
curl --silent "${artifacts_location}/${script_path}${artifacts_location_sas_token}" | sudo bash -s -- "$@"
4747
local return_value=$?
4848
if [ $return_value -ne 0 ]; then
49-
>&2 echo "Failed while executing script '$script_path'."
49+
>&2 echo "Failed while executing script '$script_path' with parameters '$@'."
5050
exit $return_value
5151
fi
5252
}
@@ -364,7 +364,7 @@ imds_cred=$(cat <<EOF
364364
<scope>GLOBAL</scope>
365365
<id>azure_service_principal</id>
366366
<description>Local Managed Identities for Azure Resources</description>
367-
</com.microsoft.azure.util.AzureImdsCredentials)
367+
</com.microsoft.azure.util.AzureImdsCredentials>
368368
EOF
369369
)
370370
sp_cred=$(cat <<EOF

0 commit comments

Comments
 (0)