Fixed regression for extensions. Updated docs to remove the rootURL p…

…arameter. (#1463)
Azure · Sep 20, 2017 · 83e4fdb · 83e4fdb
1 parent 1cab24a
commit 83e4fdb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/extensions/hello-world-dcos/README.md b/extensions/hello-world-dcos/README.md
@@ -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"
       }
     ]
 

diff --git a/extensions/hello-world/README.md b/extensions/hello-world/README.md
@@ -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" 
       }
     ]

diff --git a/pkg/acsengine/engine.go b/pkg/acsengine/engine.go
@@ -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
 }