fixed clusterInstallParameters (POSTINSTALLSCRIPTURI Script param was…

… missing), Changed comments and echos in ShellScript to reflect Docker Swarm and not Mesos (#243)
Azure · Jul 12, 2017 · f3f9b1d · f3f9b1d
1 parent 64f2fb3
commit f3f9b1d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/docker-swarm-ubuntu/azuredeploy.json b/docker-swarm-ubuntu/azuredeploy.json
@@ -114,7 +114,7 @@
         },
         "windowsJumpboxSku": {
             "type": "string",
-            "defaultValue": "2012-R2-Datacenter",
+            "defaultValue": "2016-Datacenter",
             "metadata": {
                 "description": "This is the windows sku used by the windows jumpbox"
             }
@@ -240,7 +240,7 @@
         "agentStorageAccountName": "[concat(variables('storageAccountBaseName'),'agent', variables('nameSuffix'))]",
         "jumpboxNSGName": "[concat(variables('orchestratorName'), '-jumpbox-nsg-', variables('nameSuffix'))]",
         "jumpboxNSGID": "[resourceId('Microsoft.Network/networkSecurityGroups',variables('jumpboxNSGName'))]",
-        "clusterInstallParameters": "[concat(variables('masterCount'), ' ',variables('masterVMNamePrefix'), ' ',variables('masterFirstAddr'), ' ',variables('adminUsername'),' ',' ', ' ', variables('baseSubnet'))]",        
+        "clusterInstallParameters": "[concat(variables('masterCount'), ' ',variables('masterVMNamePrefix'), ' ',variables('masterFirstAddr'), ' ',variables('adminUsername'), ' ','disabled', ' ', variables('baseSubnet'))]",        
         "jumpboxAddr": 4,
         "jumpboxVMName": "[concat('jumpboxVM-', variables('nameSuffix'))]",
         "jumpboxVMSize": "Standard_A1",

diff --git a/docker-swarm-ubuntu/parts/configure-swarm-azurestack.sh b/docker-swarm-ubuntu/parts/configure-swarm-azurestack.sh
@@ -1,18 +1,12 @@
 #!/bin/bash
 
 ###########################################################
-# Configure Mesos One Box
-#
-# This installs the following components
-# - zookeepr
-# - mesos master
-# - marathon
-# - mesos agent
+# Configure Docker Swarm Master and Agent(s)
 ###########################################################
 
 set -x
 
-echo "starting mesos cluster configuration"
+echo "starting Docker Swarm cluster configuration"
 date
 ps ax
 
@@ -275,4 +269,4 @@ fi
 echo "processes at end of script"
 ps ax
 date
-echo "completed mesos cluster configuration"
+echo "completed Docker Swarm cluster configuration"