projectatomic / commissaire-mvp

A lightweight REST interface for upgrading, restarting, and bootstrapping new hosts into an existing Container Management cluster.
http://commissaire.readthedocs.org/en/latest/
GNU General Public License v3.0
15 stars 9 forks source link

Support for flannel in server mode via networks endpoint. #190

Closed ashcrow closed 8 years ago

ashcrow commented 8 years ago

This adds support for using flannel in client-server mode. For more information please see https://github.com/coreos/flannel/blob/master/Documentation/client-server.md

The following endpoints have been added:

A network is defined via a name, type, and options.

Example:

  {
      "name": "mynetwork",
      "type": "flannel_server",
      "options": {
          "address": "192.168.152.101:8080"
      }
  }
ashcrow commented 8 years ago

(8) [multi-host-mgr] Decouple flanneld configuration from etcd

mbarnes commented 8 years ago

Just asking: is there some reason why network options needs to be split out as a separate JSON object? Seems like address and any other options could sit alongside name and type without conflict. If it's just convention that's fine; no strong opinion.

ashcrow commented 8 years ago

Just asking: is there some reason why network options needs to be split out as a separate JSON object? Seems like address and any other options could sit alongside name and type without conflict. If it's just convention that's fine; no strong opinion.

At this point it would be fine to have address sit along side but if/when other networks are added I believe they will end up taking vastly different options. Instead of trying to guess them I went with a fuzzy json object.

mbarnes commented 8 years ago

At this point it would be fine to have address sit along side but if/when other networks are added I believe they will end up taking vastly different options. Instead of trying to guess them I went with a fuzzy json object.

Makes sense. On further thought, probably better practice to keep the static and variant parts separate (as you have it).

ashcrow commented 8 years ago

:arrow_up:

mbarnes commented 8 years ago

Nice. :+1:

@rh-atomic-bot r+

rh-atomic-bot commented 8 years ago

:pushpin: Commit 1166295 has been approved by mbarnes

rh-atomic-bot commented 8 years ago

:hourglass: Testing commit 1166295 with merge b91267b...

mbarnes commented 8 years ago

What is up with homu lately? I'll merge manually.

mbarnes commented 8 years ago

Squashed locally, retested and pushed to master.