зеркало из https://github.com/Azure/acs-engine.git
Fixed regression for extensions. Updated docs to remove the rootURL parameter. (#1463)
This commit is contained in:
Родитель
1cab24af86
Коммит
83e4fdb184
|
@ -35,8 +35,7 @@ dcos task log hello-marathon
|
|||
"extensionProfiles": [
|
||||
{
|
||||
"name": "hello-world-dcos",
|
||||
"version": "v1",
|
||||
"rootURL": "https://bagbyimages.blob.core.windows.net:443/"
|
||||
"version": "v1"
|
||||
}
|
||||
]
|
||||
|
||||
|
|
|
@ -36,7 +36,6 @@ ls -l /var/log
|
|||
{
|
||||
"name": "hello-world-dcos",
|
||||
"version": "v1",
|
||||
"rootURL": "https://bagbyimages.blob.core.windows.net:443/",
|
||||
"script": "hello.sh"
|
||||
}
|
||||
]
|
||||
|
|
|
@ -1847,7 +1847,12 @@ func internalGetPoolLinkedTemplateText(extTargetVMNamePrefix, orchestratorType,
|
|||
dta = strings.Replace(dta, "EXTENSION_PARAMETERS_REPLACE", extensionsParameterReference, -1)
|
||||
dta = strings.Replace(dta, "EXTENSION_URL_REPLACE", extensionProfile.RootURL, -1)
|
||||
dta = strings.Replace(dta, "EXTENSION_TARGET_VM_NAME_PREFIX", extTargetVMNamePrefix, -1)
|
||||
dta = strings.Replace(dta, "EXTENSION_LOOP_COUNT", loopCount, -1)
|
||||
if _, err := strconv.Atoi(loopCount); err == nil {
|
||||
dta = strings.Replace(dta, "\"EXTENSION_LOOP_COUNT\"", loopCount, -1)
|
||||
} else {
|
||||
dta = strings.Replace(dta, "EXTENSION_LOOP_COUNT", loopCount, -1)
|
||||
}
|
||||
|
||||
dta = strings.Replace(dta, "EXTENSION_LOOP_OFFSET", loopOffset, -1)
|
||||
return dta, nil
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче