Some fixed to Cluster Deployment and Jumpbox configuration

README.md

@@ -2,7 +2,7 @@
 
 This Microsoft Azure template creates an Apache Mesos cluster with Marathon, and Swarm on a configurable number of machines.
 
-<a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.neting.cc%2Fanhowe%2Fmesos-scalable-cluster%2Fmaster%2Fazuredeploy.json" target="_blank">
+<a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.neting.cc%2Fclca%2Fmesos-scalable-cluster%2Fmaster%2Fazuredeploy.json" target="_blank">
     <img src="http://azuredeploy.net/deploybutton.png"/>
 </a>
 
@@ -16,7 +16,7 @@ Once your cluster has been created you will have a resource group containing 3 p
 
 The following image is an example of a cluster with 1 jumpbox, 3 masters, and 3 agents:
 
-![Image of Mesos cluster on azure](https://raw.githubusercontent.com/anhowe/mesos-scalable-cluster/master/images/mesos.png)
+![Image of Mesos cluster on azure](https://raw.githubusercontent.com/clca/mesos-scalable-cluster/master/images/mesos.png)
 
 You can see the following parts:
 

agent-0.json

@@ -14,12 +14,6 @@
         "description": "Username for the Virtual Machine."
       }
     },
-    "adminPassword": {
-      "type": "securestring",
-      "metadata": {
-        "description": "Password for the Virtual Machine."
-      }
-    },
     "dnsNameForApplicationPublicIP": {
       "type": "string",
       "metadata": {

agent-gt0.json

@@ -14,12 +14,6 @@
         "description": "Username for the Virtual Machine."
       }
     },
-    "adminPassword": {
-      "type": "securestring",
-      "metadata": {
-        "description": "Password for the Virtual Machine."
-      }
-    },
     "dnsNameForApplicationPublicIP": {
       "type": "string",
       "metadata": {

azuredeploy.json

@@ -2,10 +2,10 @@
   "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
   "contentVersion": "1.0.0.0",
   "parameters": {
-    "newStorageAccountNamePrefix": {
+    "clusterName": {
       "type": "string",
       "metadata": {
-        "description": "Globally Unique DNS Name Prefix for the Storage Account where the Virtual Machine's disks will be placed.  An integer will be appended to the end.  StorageAccounts may contain at most variables('vmsPerStorageAccount')"
+        "description": "name used to identify the cluster, storage, jumpbox public endpoints and other params will be based on the value of this parameter."
       }
     },
     "adminUsername": {
@@ -15,30 +15,6 @@
         "description": "User name for the Virtual Machine."
       }
     },
-    "adminPassword": {
-      "type": "securestring",
-      "metadata": {
-        "description": "Password for the Virtual Machine."
-      }
-    },
-    "dnsNameForJumpboxPublicIP": {
-      "type": "string",
-      "metadata": {
-        "description": "Sets the Domain name label for the jumpbox.  The concatenation of the domain name label and the regionalized DNS zone make up the fully qualified domain name associated with the public IP address."
-      }
-    },
-    "dnsNameForContainerServicePublicIP": {
-      "type": "string",
-      "metadata": {
-        "description": "Sets the Domain name label for the container service.  The concatenation of the domain name label and the regionalized DNS zone make up the fully qualified domain name associated with the public IP address."
-      }
-    },
-    "dnsNameForApplicationPublicIP": {
-      "type": "string",
-      "metadata": {
-        "description": "Sets the Domain name label for the application.  The concatenation of the domain name label and the regionalized DNS zone make up the fully qualified domain name associated with the public IP address."
-      }
-    },
     "agentCount": {
       "type": "int",
       "defaultValue": 1,
@@ -60,7 +36,7 @@
     },
     "jumpboxConfiguration": {
       "type": "string",
-      "defaultValue": "windows",
+      "defaultValue": "linux",
       "allowedValues": [
         "none",
         "linux",
@@ -70,48 +46,38 @@
         "description": "Choose to have a jumpbox for debugging on the private subnet."
       }
     },
-    "masterConfiguration": {
-      "type": "string",
-      "defaultValue": "masters-are-not-agents",
-      "allowedValues": [
-        "masters-are-agents",
-        "masters-are-not-agents"
-      ],
-      "metadata": {
-        "description": "Specify whether masters should act as agents or not."
-      }
-    },
     "agentVMSize": {
       "type": "string",
-      "defaultValue": "Standard_D1",
+      "defaultValue": "Standard_A2",
       "allowedValues": [
         "Standard_A1",
-        "Standard_D1",
+        "Standard_A1",
+        "Standard_A3",
+        "Standard_A4",
+        "Standard_A5",
+        "Standard_A6",
+        "Standard_A7",
+        "Standard_A8",
         "Standard_D2",
         "Standard_D3",
         "Standard_D4",
         "Standard_D11",
         "Standard_D12",
-        "Standard_D13",
-        "Standard_D14"
+        "Standard_D13"
       ],
       "metadata": {
         "description": "The size of the Virtual Machine."
       }
     },
     "masterVMSize": {
       "type": "string",
-      "defaultValue": "Standard_D1",
+      "defaultValue": "Standard_A2",
       "allowedValues": [
         "Standard_A1",
         "Standard_D1",
         "Standard_D2",
         "Standard_D3",
-        "Standard_D4",
-        "Standard_D11",
-        "Standard_D12",
-        "Standard_D13",
-        "Standard_D14"
+        "Standard_D4"
       ],
       "metadata": {
         "description": "The size of the Virtual Machine for the master."
@@ -123,25 +89,12 @@
       "allowedValues": [
         "Standard_A1",
         "Standard_D1",
-        "Standard_D2",
-        "Standard_D3",
-        "Standard_D4",
-        "Standard_D11",
-        "Standard_D12",
-        "Standard_D13",
-        "Standard_D14"
+        "Standard_D2"
       ],
       "metadata": {
         "description": "The size of the Virtual Machine for the jumpbox."
       }
     },
-    "clusterPrefix": {
-      "type": "string",
-      "defaultValue": "c1",
-      "metadata": {
-        "description": "The prefix to identify the cluster."
-      }
-    },
     "swarmEnabled": {
       "type": "string",
       "defaultValue": "false",
@@ -177,7 +130,7 @@
     },
     "sshRSAPublicKey": {
       "type": "string",
-      "defaultValue": "disabled",
+      "defaultValue": "",
       "metadata": {
         "description": "Configure all linux machines with the SSH rsa public key string.  Use 'disabled' to not configure access with SSH rsa public key."
       }
@@ -191,15 +144,19 @@
     },
     "omsStorageAccountKey": {
       "type": "securestring",
+      "defaultValue":"none",
       "metadata": {
         "description": "The Azure Storage account primary or secondary key for OMS log data.  Use 'none' to disable."
       }
     }
   },
   "variables": {
-    "masterVMNamePrefix": "[concat(parameters('clusterPrefix'),'master')]",
-    "agentVMNamePrefix": "[concat(parameters('clusterPrefix'),'agent')]",
-    "jumpboxVMNamePrefix": "[concat(parameters('clusterPrefix'),'jumpbox')]",
+    "newStorageAccountNamePrefix": "[concat(parameters('clusterName'),'storage')]",
+    "dnsNameForApplicationPublicIP":"[parameters('clusterName')]", 
+    "dnsNameForJumpboxPublicIP": "[concat(parameters('clusterName'),'jb')]",
+    "masterVMNamePrefix": "master",
+    "agentVMNamePrefix": "agent",
+    "jumpboxVMNamePrefix": "jb",
     "osImagePublisher": "Canonical",
     "osImageOffer": "UbuntuServer",
     "osImageSKU": "14.04.3-LTS",
@@ -213,10 +170,10 @@
     "jumpboxAddr": 4,
     "masterFirstAddr": 5,
     "agentFirstAddr": 50,
-    "nsgName": "node-nsg",
+    "nsgName": "agent-nsg",
     "nsgID": "[resourceId('Microsoft.Network/networkSecurityGroups',variables('nsgName'))]",
     "storageAccountType": "Standard_GRS",
-    "customScriptLocation": "https://raw.githubusercontent.com/anhowe/mesos-scalable-cluster/master/",
+    "customScriptLocation": "https://raw.githubusercontent.com/clca/mesos-scalable-cluster/master/",
     "agentFiles": [
       "agent-0.json",
       "agent-gt0.json"
@@ -228,7 +185,7 @@
   "resources": [
     {
       "type": "Microsoft.Storage/storageAccounts",
-      "name": "[concat(parameters('newStorageAccountNamePrefix'),'0')]",
+      "name": "[variables('newStorageAccountNamePrefix')]",
       "apiVersion": "2015-05-01-preview",
       "location": "[resourceGroup().location]",
       "properties": {
@@ -319,7 +276,7 @@
       "type": "Microsoft.Resources/deployments",
       "name": "createMasterNodes",
       "dependsOn": [
-        "[concat('Microsoft.Storage/storageAccounts/', parameters('newStorageAccountNamePrefix'), '0')]",
+        "[concat('Microsoft.Storage/storageAccounts/', variables('newStorageAccountNamePrefix'))]",
         "[variables('vnetID')]"
       ],
       "properties": {
@@ -330,13 +287,7 @@
         },
         "parameters": {
           "newStorageAccountName": {
-            "value": "[concat(parameters('newStorageAccountNamePrefix'), '0')]"
-          },
-          "adminUsername": {
-            "value": "[parameters('adminUsername')]"
-          },
-          "adminPassword": {
-            "value": "[parameters('adminPassword')]"
+            "value": "[variables('newStorageAccountNamePrefix')]"
           },
           "dnsNameForContainerServicePublicIP": {
             "value": "[parameters('dnsNameForContainerServicePublicIP')]"
@@ -413,13 +364,7 @@
         },
         "parameters": {
           "newStorageAccountNamePrefix": {
-            "value": "[concat(parameters('newStorageAccountNamePrefix'))]"
-          },
-          "adminUsername": {
-            "value": "[parameters('adminUsername')]"
-          },
-          "adminPassword": {
-            "value": "[parameters('adminPassword')]"
+            "value": "[concat(varibles('newStorageAccountNamePrefix'))]"
           },
           "dnsNameForApplicationPublicIP": {
             "value": "[parameters('dnsNameForApplicationPublicIP')]"
@@ -489,7 +434,7 @@
       "type": "Microsoft.Resources/deployments",
       "name": "createJumpbox",
       "dependsOn": [
-        "[concat('Microsoft.Storage/storageAccounts/', parameters('newStorageAccountNamePrefix'), '0')]",
+        "[concat('Microsoft.Storage/storageAccounts/', variables('newStorageAccountNamePrefix'))]",
         "[variables('vnetID')]"
       ],
       "properties": {
@@ -500,14 +445,11 @@
         },
         "parameters": {
           "newStorageAccountName": {
-            "value": "[concat(parameters('newStorageAccountNamePrefix'), '0')]"
+            "value": "[variables('newStorageAccountNamePrefix')]"
           },
-          "adminUsername": {
+        "adminUsername": {
             "value": "[parameters('adminUsername')]"
           },
-          "adminPassword": {
-            "value": "[parameters('adminPassword')]"
-          },
           "dnsNameForJumpboxPublicIP": {
             "value": "[parameters('dnsNameForJumpboxPublicIP')]"
           },
@@ -534,6 +476,12 @@
           },
           "sshRSAPublicKey": {
             "value": "[parameters('sshRSAPublicKey')]"
+          },
+         "masterCount": {
+            "value": "[parameters('masterCount')]"
+          },
+	 	"masterFirstAddr": {
+            "value": "[variables('masterFirstAddr')]"
           }
         }
       }