diff --git a/cservice/README.md b/cservice/README.md index 908f1c0..18dc84c 100644 --- a/cservice/README.md +++ b/cservice/README.md @@ -39,6 +39,7 @@ Here are notes for troubleshooting: # Template Parameters When you launch the installation of the cluster, you need to specify the following parameters: * `adminPassword`: self-explanatory +* `jumpboxOS`: The type of OS to be used for the jumpbox can be either Windows or Linux * `jumpboxEndpointDNSName`: this is the public DNS name for the entrypoint that SWARM is going to use to deploy containers in the cluster. * `managementEndpointDNSName`: this is the public DNS name for the jumpbox that you will use to connect to the cluster. You just need to specify an unique name, the FQDN will be created by adding the necessary subdomains based on where the cluster is going to be created. Ex. MesosCluster, Azure will add westus.cloudapp.azure.com to create the FQDN for the jumpbox. * `applicationEndpointDNSName`: this is the public DNS for the application. It has a load balancer with ports 80 and 443 open. @@ -115,7 +116,7 @@ Before running this walkthrough ensure you have created a cluster choosing "true ![Image of Chronos UI](https://raw.githubusercontent.com/anhowe/scratch/master/cservice/images/chronos-ui.png) -2. Click Add and fill in the following details: +2. Click New Job and fill in the following details: 1. Name - "MyFirstApp" 2. Command - "echo "my first app on Chronos"" 3. Owner, and Owner Name - you can put random information Here diff --git a/cservice/azuredeploy.json b/cservice/azuredeploy.json index f9dbdd3..3ff9a31 100644 --- a/cservice/azuredeploy.json +++ b/cservice/azuredeploy.json @@ -23,7 +23,7 @@ "Linux" ], "metadata": { - "description": "The size of the Virtual Machine. Allowable machine values are 1 core (A1), 2 core (A2), 4 core (A3), 8 core (A4)." + "description": "The type of OS for the Jumpbox" } }, "jumpboxEndpointDNSNamePrefix": { diff --git a/cservice/azuredeploy.parameters.json b/cservice/azuredeploy.parameters.json index b6147ff..3ac7e71 100644 --- a/cservice/azuredeploy.parameters.json +++ b/cservice/azuredeploy.parameters.json @@ -3,19 +3,19 @@ "value": "azureuser" }, "adminPassword": { - "value": "password1234$" + "value": "changeme" }, - "jumpboxEndpointDNSNamePrefix": { + "jumpboxOS": { "value": "Windows" }, "jumpboxEndpointDNSNamePrefix": { - "value": "anhowe1116b" + "value": "changeme" }, "managementEndpointDNSNamePrefix": { - "value": "anhowemgmt1116b" + "value": "changeme" }, "applicationEndpointDNSNamePrefix": { - "value": "anhoweapp1116b" + "value": "changeme" }, "agentCount": { "value": 3 @@ -27,6 +27,6 @@ "value": "Standard_A1" }, "sshRSAPublicKey": { - "value": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8fhkh3jpHUQsrUIezFB5k4Rq9giJM8G1Cr0u2IRMiqG++nat5hbOr3gODpTA0h11q9bzb6nJtK7NtDzIHx+w3YNIVpcTGLiUEsfUbY53IHg7Nl/p3/gkST3g0R6BSL7Hg45SfyvpH7kwY30MoVHG/6P3go4SKlYoHXlgaaNr3fMwUTIeE9ofvyS3fcr6xxlsoB6luKuEs50h0NGsE4QEnbfSY4Yd/C1ucc3mEw+QFXBIsENHfHfZYrLNHm2L8MXYVmAH8k//5sFs4Migln9GiUgEQUT6uOjowsZyXBbXwfT11og+syPkAq4eqjiC76r0w6faVihdBYVoc/UcyupgH azureuser@linuxvm" + "value": "Disabled" } } diff --git a/cservice/images/marathon-docker.png b/cservice/images/marathon-docker.png index d83c806..973cf12 100644 Binary files a/cservice/images/marathon-docker.png and b/cservice/images/marathon-docker.png differ diff --git a/cservice/images/marathon-newapp.png b/cservice/images/marathon-newapp.png index 0d1576a..0ff7d75 100644 Binary files a/cservice/images/marathon-newapp.png and b/cservice/images/marathon-newapp.png differ