Revert changes to azure-jenkins template

From commit 3a47045 and 67b9bca

azure-jenkins/README.md

@@ -38,13 +38,6 @@ Run this command:
 ssh -L 8080:localhost:8080 <User name>@<Public DNS name of instance you just created>
 ```
 
-If you see the following error: "bind:address is already in use", then you need to include the IP Address as follows:
-
-```
-ssh -L localhost:8080:<Public IP>:8080 <User name@<Public IP>
-```
-
-
 ## C. Configure Sample Jobs and Azure Active Directory configuration
 1. Once you are logged into the VM, run /opt/azure_jenkins_config/config_azure.sh and pick option 1 - "All of the below". This script will guide you to set up and configure the Azure Storage plugin to be used in the sample jobs to upload and download to Storage.
 It will also provide a Service Principal to access Azure resources from Jenkins.

azure-jenkins/azuredeploy.json

@@ -18,23 +18,22 @@
     "jenkinsDnsPrefix": {
       "type": "string",
       "minLength": 1,
-      "maxLength": 11,
       "metadata": {
         "description": "Globally unique DNS Name for the Public IP used to access the Virtual Machine."
       }
     }
   },
   "variables": {
-    "resourcePrefix": "[parameters('jenkinsDnsPrefix')]",
-    "storageAccountName": "[concat(parameters('jenkinsDnsPrefix'), uniquestring(resourceGroup().id))]",
-    "OSDiskName": "[concat(parameters('jenkinsDnsPrefix'), 'OSDisk')]",
-    "nicName": "[concat(parameters('jenkinsDnsPrefix'), 'VMNic')]",
-    "subnetName": "[concat(parameters('jenkinsDnsPrefix'), 'Subnet')]",
-    "publicIPAddressName": "[concat(parameters('jenkinsDnsPrefix'), 'PublicIP')]",
+    "resourcePrefix": "jenkins",
+    "storageAccountName": "[concat(variables('resourcePrefix'), uniquestring(resourceGroup().id))]",
+    "OSDiskName": "[concat(variables('resourcePrefix'), 'OSDisk')]",
+    "nicName": "[concat(variables('resourcePrefix'), 'VMNic')]",
+    "subnetName": "[concat(variables('resourcePrefix'), 'Subnet')]",
+    "publicIPAddressName": "[concat(variables('resourcePrefix'), 'PublicIP')]",
     "vmStorageAccountContainerName": "vhds",
-    "vmName": "[concat(parameters('jenkinsDnsPrefix'), 'VM')]",
-    "virtualNetworkName": "[concat(parameters('jenkinsDnsPrefix'), 'VNET')]",
-    "frontEndNSGName": "[concat(parameters('jenkinsDnsPrefix'), 'NSG')]",
+    "vmName": "[concat(variables('resourcePrefix'), 'VM')]",
+    "virtualNetworkName": "[concat(variables('resourcePrefix'), 'VNET')]",
+    "frontEndNSGName": "[concat(variables('resourcePrefix'), 'NSG')]",
     "_artifactsLocation": "https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/azure-jenkins/",
     "_artifactsLocationSasToken": ""
   },
@@ -85,20 +84,6 @@
               "priority": 100,
               "direction": "Inbound"
             }
-          },
-          {
-            "name": "http-rule",
-            "properties": {
-              "description": "Allow HTTP",
-              "protocol": "Tcp",
-              "sourcePortRange": "*",
-              "destinationPortRange": "8080",
-              "sourceAddressPrefix": "Internet",
-              "destinationAddressPrefix": "*",
-              "access": "Allow",
-              "priority": 101,
-              "direction": "Inbound"
-            }
           }
         ]
       }

azure-jenkins/azuredeploy.parameters.json

@@ -9,7 +9,7 @@
       "value": "GEN-PASSWORD"
     },
     "jenkinsDnsPrefix": {
-      "value": "GEN-UNIQUE-5"
+      "value": "GEN-UNIQUE"
     }
   }
 }