Skip to content
This repository has been archived by the owner on Jan 21, 2020. It is now read-only.

Swarm flavor revamp #376

Merged
merged 20 commits into from Feb 1, 2017
Merged

Conversation

chungers
Copy link
Contributor

@chungers chungers commented Feb 1, 2017

This PR overhauls how the Swarm flavor plugin works. Before, the swarm flavor had to be run separately between the manager and workers -- where the manager is a single node, configured by a vanilla plugin, while the workers are configured separately using the swarm flavor itself. Now the swarm flavor plugin

  • relies heavily on templates - one for worker and one for manager to give the user the ability to customize what additional tasks are to be run in the init scripts.
  • uses the manager's multi-group handling to make managing two different groups in a single JSON configuration possible.
  • the templates allows the user to control the init for the first node (where swarm init is needed) and the manager followers and the workers. New template functions are introduced so that the user can essentially program how the init sequence for the different nodes should work.
  • removes the need to bootstrap initial leader manager node via the vanilla plugin.
  • a single configuration, a single commit, can provision both the manager and worker groups.
  • a different version of using actual get.docker.com script to install Docker is also provided -- as compared to the previous demos of using pre-installed docker on vagrant boxes.

David Chung added 11 commits January 21, 2017 23:47
Signed-off-by: David Chung <david.chung@docker.com>
Signed-off-by: David Chung <david.chung@docker.com>
Signed-off-by: David Chung <david.chung@docker.com>
Signed-off-by: David Chung <david.chung@docker.com>
Signed-off-by: David Chung <david.chung@docker.com>
…emplate

Signed-off-by: David Chung <david.chung@docker.com>
Signed-off-by: David Chung <david.chung@docker.com>
Signed-off-by: David Chung <david.chung@docker.com>
Signed-off-by: David Chung <david.chung@docker.com>
Signed-off-by: David Chung <david.chung@docker.com>
Signed-off-by: David Chung <david.chung@docker.com>
@chungers chungers added this to the v0.3 milestone Feb 1, 2017
@GordonTheTurtle
Copy link

Please sign your commits following these rules:
https://github.com/docker/docker/blob/master/CONTRIBUTING.md#sign-your-work
The easiest way to do this is to amend the last commit:

$ git clone -b "swarm-flavor-revamp" git@github.com:chungers/infrakit.git somewhere
$ cd somewhere
$ git rebase -i HEAD~842354041880
editor opens
change each 'pick' to 'edit'
save the file and quit
$ git commit --amend -s --no-edit
$ git rebase --continue # and repeat the amend for each commit
$ git push -f

Amending updates the existing PR. You DO NOT need to open a new one.

David Chung added 8 commits February 1, 2017 02:09
Signed-off-by: David Chung <david.chung@docker.com>
Signed-off-by: David Chung <david.chung@docker.com>
Signed-off-by: David Chung <david.chung@docker.com>
Signed-off-by: David Chung <david.chung@docker.com>
Signed-off-by: David Chung <david.chung@docker.com>
…plementation

Signed-off-by: David Chung <david.chung@docker.com>
Signed-off-by: David Chung <david.chung@docker.com>
@chungers chungers merged commit 645e798 into docker-archive:master Feb 1, 2017
chungers pushed a commit to chungers/infrakit that referenced this pull request Sep 30, 2017
* Move host key generation out of images

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

* Remove SSH load balancer

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants