Update orchestratorType to SwarmMode (#260)

* Update orchestator type to SwarmMode from DockerCE

* Update

Author: amanohar

README.md

@@ -21,7 +21,7 @@ The cluster definition file enables the following customizations to your Docker
 * [DC/OS Walkthrough](docs/dcos.md) - shows how to create a DC/OS enabled Docker cluster on Azure
 * [Kubernetes Walkthrough](docs/kubernetes.md) - shows how to create a Kubernetes enabled Docker cluster on Azure
 * [Swarm Walkthrough](docs/swarm.md) - shows how to create a Swarm enabled Docker cluster on Azure
-* [DockerCE/Swarm Mode Walkthrough](docs/swarmmode.md) - shows how to create a DockerCE cluster on Azure
+* [Swarm Mode Walkthrough](docs/swarmmode.md) - shows how to create a Swarm Mode cluster on Azure
 * [Custom VNET](examples/vnet) - shows how to use a custom VNET 
 * [Attached Disks](examples/disks-storageaccount) - shows how to attach up to 4 disks per node
 * [Managed Disks](examples/disks-managed) (under private preview) - shows how to use managed disks 

docs/README.md

@@ -12,7 +12,7 @@ This cluster definition examples demonstrate how to create a customized Docker E
 * [Kubernetes Walkthrough](kubernetes.md) - shows how to create a Kubernetes enabled Docker cluster on Azure
 * [Kubernetes Windows Walkthrough](kubernetes.windows.md) - shows how to create a hybrid Kubernetes Windows enabled Docker cluster on Azure.
 * [Swarm Walkthrough](swarm.md) - shows how to create a Swarm enabled Docker cluster on Azure
-* [DockerCE/Swarm Mode Walkthrough](swarmmode.md) - shows how to create a DockerCE cluster on Azure
+* [Swarm Mode Walkthrough](swarmmode.md) - shows how to create a Swarm Mode cluster on Azure
 * [Custom VNET](../examples/vnet) - shows how to use a custom VNET 
 * [Attached Disks](../examples/disks-storageaccount) - shows how to attach up to 4 disks per node
 * [Managed Disks](../examples/disks-managed) (under private preview) - shows how to use managed disks 

docs/clusterdefinition.md

@@ -22,7 +22,7 @@ Here are the valid values for the orchestrator types:
 1. `DCOS` - this represents the [DC/OS orchestrator](dcos.md).  [Older versions of DCOS173 and DCOS184 may be specified](../examples/dcos-versions).
 2. `Kubernetes` - this represents the [Kubernetes orchestrator](kubernetes.md).
 3. `Swarm` - this represents the [Swarm orchestrator](swarm.md).
-4. `DockerCE` - this represents the [DockerCE/Swarm Mode orchestrator](swarmmode.md).
+4. `Swarm Mode` - this represents the [Swarm Mode orchestrator](swarmmode.md).
 
 ### masterProfile
 `masterProfile` describes the settings for master configuration.
@@ -110,7 +110,7 @@ Here are the valid values for the orchestrator types:
 1. `DCOS` - this represents the [DC/OS orchestrator](dcos.md).
 2. `Swarm` - this represents the [Swarm orchestrator](swarm.md).
 3. `Kubernetes` - this represents the [Kubernetes orchestrator](kubernetes.md).
-4. `DockerCE` - this represents the [DockerCE/Swarm Mode orchestrator](swarmmode.md).
+4. `Swarm Mode` - this represents the [Swarm Mode orchestrator](swarmmode.md).
 
 ### masterProfile
 `masterProfile` describes the settings for master configuration.

docs/swarmmode.md

@@ -1,18 +1,18 @@
-# Microsoft Azure Container Service Engine - DockerCE/Swarm Mode Walkthrough
+# Microsoft Azure Container Service Engine - Swarm Mode Walkthrough
 
 ## Deployment
 
-Here are the steps to deploy a simple DockerCE cluster:
+Here are the steps to deploy a simple Swarm Mode cluster:
 
 1. [install acs-engine](acsengine.md#downloading-and-building-acs-engine)
 2. [generate your ssh key](ssh.md#ssh-key-generation)
-3. edit the [DockerCE/Swarm Mode example](../examples/swarmmode.json) and fill in the blank strings
+3. edit the [Swarm Mode example](../examples/swarmmode.json) and fill in the blank strings
 4. [generate the template](acsengine.md#generating-a-template)
 5. [deploy the output azuredeploy.json and azuredeploy.parameters.json](../README.md#deployment-usage)
 
 ## Walkthrough
 
-Once your DockerCE/Swarm Mode cluster has been deployed you will have a resource group containing:
+Once your Swarm Mode cluster has been deployed you will have a resource group containing:
 
 1. a set of 1,3, or 5 masters in a master availability set.  Each master's SSH can be accessed via the public dns address at ports 2200..2204. First master's SSH can also be accessed via public dns address on port 22.
 
@@ -24,7 +24,7 @@ The following image shows the architecture of a container service cluster with 3
 
  All VMs are in the same VNET where the masters are on private subnet 172.16.0.0/24 and the agents are on the private subnet, 10.0.0.0/16, and fully accessible to each other.
 
-## Create your First Two DockerCE/Swarm Mode Docker services: hello-world, and Docker web app
+## Create your First Two Swarm Mode Docker services: hello-world, and Docker web app
 
 After completing this walkthrough you will know how to:
  * display information from Swarm Mode,

examples/README.md

@@ -11,7 +11,7 @@ These cluster definition examples demonstrate how to create a customized Docker
 * [DC/OS Walkthrough](../docs/dcos.md) - shows how to create a DC/OS enabled Docker cluster on Azure
 * [Kubernetes Walkthrough](../docs/kubernetes.md) - shows how to create a Kubernetes enabled Docker cluster on Azure
 * [Swarm Walkthrough](../docs/swarm.md) - shows how to create a Swarm enabled Docker cluster on Azure
-* [DockerCE/Swarm Mode Walkthrough](../docs/swarmmode.md) - shows how to create a DockerCE cluster on Azure
+* [Swarm Mode Walkthrough](../docs/swarmmode.md) - shows how to create a Swarm Mode cluster on Azure
 * [Custom VNET](vnet) - shows how to use a custom VNET 
 * [Attached Disks](disks-storageaccount) - shows how to attach up to 4 disks per node
 * [Managed Disks](disks-managed) (under private preview) - shows how to use managed disks 

examples/disks-managed/swarmmode-vmas.json

@@ -2,7 +2,7 @@
   "apiVersion": "vlabs",
   "properties": {
     "orchestratorProfile": {
-      "orchestratorType": "DockerCE"
+      "orchestratorType": "SwarmMode"
     },
     "masterProfile": {
       "count": 1,

examples/disks-managed/swarmmode-vmss.json

@@ -2,7 +2,7 @@
   "apiVersion": "vlabs",
   "properties": {
     "orchestratorProfile": {
-      "orchestratorType": "DockerCE"
+      "orchestratorType": "SwarmMode"
     },
     "masterProfile": {
       "count": 1,

examples/disks-storageaccount/README.md

@@ -9,4 +9,4 @@ The examples show you how to configure up to 4 attached disks.  The disks can ra
 1. **dcos.json** - deploying and using [DC/OS](../../docs/dcos.md)
 2. **kubernetes.json** - deploying and using [Kubernetes](../../docs/kubernetes.md)
 3. **swarm.json** - deploying and using [Swarm](../../docs/swarm.md)
-4. **swarmmode.json** - deploying and using [Swarm Mode/DockerCE](../../docs/swarmmode.md)
+4. **swarmmode.json** - deploying and using [Swarm Mode](../../docs/swarmmode.md)

examples/disks-storageaccount/swarmmode.json

@@ -2,7 +2,7 @@
   "apiVersion": "vlabs",
   "properties": {
     "orchestratorProfile": {
-      "orchestratorType": "DockerCE"
+      "orchestratorType": "SwarmMode"
     },
     "masterProfile": {
       "count": 3,

examples/keyvaultcerts/README.md

@@ -10,7 +10,7 @@ The examples show you how to configure installing a cert from keyvault. These ce
 2. **kubernetes.json** - deploying and using [Kubernetes](../../docs/kubernetes.md)
 3. **swarm.json** - deploying and using [Swarm](../../docs/swarm.md)
 4. **swarm-windows.json** - deploying and using [Swarm](../../docs/swarm.md)
-5. **swarmmode.json** - deploying and using [Swarm Mode/DockerCE](../../docs/swarmmode.md)
+5. **swarmmode.json** - deploying and using [Swarm Mode](../../docs/swarmmode.md)
 
 On windows machines certificates will be installed under the machine in the specified store.
 On linux machines the certificates will be installed in the folder /var/lib/waagent/. There will be two files