d407b82968
fix import
...
Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
2015-11-09 08:24:52 +00:00
0c98d05ebf
tst
...
Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
2015-03-28 20:08:30 +03:00
Jonathan Boulle
c093e44049
Merge pull request #305 from jonboulle/copyright
...
*: switch to line comments for copyright
2015-01-25 10:28:52 -08:00
Jonathan Boulle
be68a8e5cc
*: switch to line comments for copyright
...
Build tags are not compatible with block comments. Also adds copyright
header to a few places it was missing.
2015-01-24 19:32:33 -08:00
Eugene Yakubovich
58f0dadaf9
config: document and update flannel config values
...
Fixes #297
2015-01-13 15:51:47 -08:00
Thom May
9be836df31
Create an environment file for flannel
...
Rather than using a systemd overlay, allow docker to load the
environment file. This is due to coreos/coreos-overlay#1002
2014-12-29 10:27:22 +00:00
Alex Crawford
ffc54b028c
drop-in: add support for drop-ins
...
This allows a list of drop-ins for a unit to be declared inline within a
cloud-config. For example:
#cloud-config
coreos:
units:
- name: docker.service
drop-ins:
- name: 50-insecure-registry.conf
content: |
[Service]
Environment=DOCKER_OPTS='--insecure-registry="10.0.1.0/24"'
2014-11-26 14:09:35 -08:00
Thom May
333468dba3
the flannel service is called flanneld
2014-11-25 14:00:53 +00:00
Eugene Yakubovich
a20addd05e
flannel: added flannel support and helper to make dropins
...
fleet, flannel, and etcd all generate dropins from config.
To reduce code duplication, factor out a helper to do that.
2014-11-14 10:45:23 -08:00
