Skip to content
This repository was archived by the owner on Jan 11, 2023. It is now read-only.

Commit 4f26573

Browse files
amanoharamanohar
authored
Update orchestratorType to SwarmMode (#260)
* Update orchestator type to SwarmMode from DockerCE * Update
1 parent 657a0e2 commit 4f26573

40 files changed

+105
-105
lines changed

‎README.md

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

‎docs/README.md

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

‎docs/clusterdefinition.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Here are the valid values for the orchestrator types:
2222
1. `DCOS` - this represents the [DC/OS orchestrator](dcos.md). [Older versions of DCOS173 and DCOS184 may be specified](../examples/dcos-versions).
2323
2. `Kubernetes` - this represents the [Kubernetes orchestrator](kubernetes.md).
2424
3. `Swarm` - this represents the [Swarm orchestrator](swarm.md).
25-
4. `DockerCE` - this represents the [DockerCE/Swarm Mode orchestrator](swarmmode.md).
25+
4. `Swarm Mode` - this represents the [Swarm Mode orchestrator](swarmmode.md).
2626

2727
### masterProfile
2828
`masterProfile` describes the settings for master configuration.
@@ -110,7 +110,7 @@ Here are the valid values for the orchestrator types:
110110
1. `DCOS` - this represents the [DC/OS orchestrator](dcos.md).
111111
2. `Swarm` - this represents the [Swarm orchestrator](swarm.md).
112112
3. `Kubernetes` - this represents the [Kubernetes orchestrator](kubernetes.md).
113-
4. `DockerCE` - this represents the [DockerCE/Swarm Mode orchestrator](swarmmode.md).
113+
4. `Swarm Mode` - this represents the [Swarm Mode orchestrator](swarmmode.md).
114114

115115
### masterProfile
116116
`masterProfile` describes the settings for master configuration.

‎docs/swarmmode.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
# Microsoft Azure Container Service Engine - DockerCE/Swarm Mode Walkthrough
1+
# Microsoft Azure Container Service Engine - Swarm Mode Walkthrough
22

33
## Deployment
44

5-
Here are the steps to deploy a simple DockerCE cluster:
5+
Here are the steps to deploy a simple Swarm Mode cluster:
66

77
1. [install acs-engine](acsengine.md#downloading-and-building-acs-engine)
88
2. [generate your ssh key](ssh.md#ssh-key-generation)
9-
3. edit the [DockerCE/Swarm Mode example](../examples/swarmmode.json) and fill in the blank strings
9+
3. edit the [Swarm Mode example](../examples/swarmmode.json) and fill in the blank strings
1010
4. [generate the template](acsengine.md#generating-a-template)
1111
5. [deploy the output azuredeploy.json and azuredeploy.parameters.json](../README.md#deployment-usage)
1212

1313
## Walkthrough
1414

15-
Once your DockerCE/Swarm Mode cluster has been deployed you will have a resource group containing:
15+
Once your Swarm Mode cluster has been deployed you will have a resource group containing:
1616

1717
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.
1818

@@ -24,7 +24,7 @@ The following image shows the architecture of a container service cluster with 3
2424

2525
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.
2626

27-
## Create your First Two DockerCE/Swarm Mode Docker services: hello-world, and Docker web app
27+
## Create your First Two Swarm Mode Docker services: hello-world, and Docker web app
2828

2929
After completing this walkthrough you will know how to:
3030
* display information from Swarm Mode,

‎examples/README.md

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

‎examples/disks-managed/swarmmode-vmas.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"apiVersion": "vlabs",
33
"properties": {
44
"orchestratorProfile": {
5-
"orchestratorType": "DockerCE"
5+
"orchestratorType": "SwarmMode"
66
},
77
"masterProfile": {
88
"count": 1,

‎examples/disks-managed/swarmmode-vmss.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"apiVersion": "vlabs",
33
"properties": {
44
"orchestratorProfile": {
5-
"orchestratorType": "DockerCE"
5+
"orchestratorType": "SwarmMode"
66
},
77
"masterProfile": {
88
"count": 1,

‎examples/disks-storageaccount/README.md

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

‎examples/disks-storageaccount/swarmmode.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"apiVersion": "vlabs",
33
"properties": {
44
"orchestratorProfile": {
5-
"orchestratorType": "DockerCE"
5+
"orchestratorType": "SwarmMode"
66
},
77
"masterProfile": {
88
"count": 3,

‎examples/keyvaultcerts/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ The examples show you how to configure installing a cert from keyvault. These ce
1010
2. **kubernetes.json** - deploying and using [Kubernetes](../../docs/kubernetes.md)
1111
3. **swarm.json** - deploying and using [Swarm](../../docs/swarm.md)
1212
4. **swarm-windows.json** - deploying and using [Swarm](../../docs/swarm.md)
13-
5. **swarmmode.json** - deploying and using [Swarm Mode/DockerCE](../../docs/swarmmode.md)
13+
5. **swarmmode.json** - deploying and using [Swarm Mode](../../docs/swarmmode.md)
1414

1515
On windows machines certificates will be installed under the machine in the specified store.
1616
On linux machines the certificates will be installed in the folder /var/lib/waagent/. There will be two files

‎examples/keyvaultcerts/swarmmode.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"apiVersion": "vlabs",
33
"properties": {
44
"orchestratorProfile": {
5-
"orchestratorType": "DockerCE"
5+
"orchestratorType": "SwarmMode"
66
},
77
"masterProfile": {
88
"count": 3,

‎examples/largeclusters/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ The examples show you how to configure up to 12 agent pools with 100 nodes each:
1111
3. **kubernetes.json** - deploying and using [Kubernetes](../../docs/kubernetes.md)
1212
4. **swarm.json** - deploying and using [Swarm](../../docs/swarm.md)
1313
5. **swarm-vmas.json** - this provides an example using availability sets instead of the default virtual machine scale sets. You will want to use availability sets if you want to dynamically attach/detach disks.
14-
6. **swarmmode.json** - deploying and using [Swarm Mode/DockerCE](../../docs/swarmmode.md)
14+
6. **swarmmode.json** - deploying and using [Swarm Mode](../../docs/swarmmode.md)
1515
7. **swarmmode-vmas.json** - this provides an example using availability sets instead of the default virtual machine scale sets. You will want to use availability sets if you want to dynamically attach/detach disks.

‎examples/largeclusters/swarmmode-vmas.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"apiVersion": "vlabs",
33
"properties": {
44
"orchestratorProfile": {
5-
"orchestratorType": "DockerCE"
5+
"orchestratorType": "SwarmMode"
66
},
77
"masterProfile": {
88
"count": 3,

‎examples/largeclusters/swarmmode.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"apiVersion": "vlabs",
33
"properties": {
44
"orchestratorProfile": {
5-
"orchestratorType": "DockerCE"
5+
"orchestratorType": "SwarmMode"
66
},
77
"masterProfile": {
88
"count": 1,

‎examples/swarmmode.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"apiVersion": "vlabs",
33
"properties": {
44
"orchestratorProfile": {
5-
"orchestratorType": "DockerCE"
5+
"orchestratorType": "SwarmMode"
66
},
77
"masterProfile": {
88
"count": 3,

‎examples/vnet/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ To try:
1313
1. **dcos.json** - deploying and using [DC/OS](../../docs/dcos.md)
1414
2. **kubernetes.json** - deploying and using [Kubernetes](../../docs/kubernetes.md)
1515
3. **swarm.json** - deploying and using [Swarm](../../docs/swarm.md)
16-
4. **swarmmodevnet.json** - deploying and using [Swarm Mode/DockerCE](../../docs/swarmmode.md)
16+
4. **swarmmodevnet.json** - deploying and using [Swarm Mode](../../docs/swarmmode.md)
1717

‎examples/vnet/swarmmodevnet.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"apiVersion": "vlabs",
33
"properties": {
44
"orchestratorProfile": {
5-
"orchestratorType": "DockerCE"
5+
"orchestratorType": "SwarmMode"
66
},
77
"masterProfile": {
88
"count": 3,

‎examples/windows/swarmmode.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"properties": {
55
"provisioningState": "",
66
"orchestratorProfile": {
7-
"orchestratorType": "DockerCE"
7+
"orchestratorType": "SwarmMode"
88
},
99
"masterProfile": {
1010
"count": 3,

‎pkg/acsengine/engine.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ func prepareTemplateFiles(properties *api.Properties) ([]string, string, error)
271271
} else if properties.OrchestratorProfile.OrchestratorType == api.Kubernetes {
272272
files = append(commonTemplateFiles, kubernetesTemplateFiles...)
273273
baseFile = kubernetesBaseFile
274-
} else if properties.OrchestratorProfile.OrchestratorType == api.DockerCE {
274+
} else if properties.OrchestratorProfile.OrchestratorType == api.SwarmMode {
275275
files = append(commonTemplateFiles, swarmModeTemplateFiles...)
276276
baseFile = swarmBaseFile
277277
} else {

0 commit comments

Comments
 (0)