unistack-org/cloudinit
4
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Create an environment file for flannel

Browse Source 
Rather than using a systemd overlay, allow docker to load the
environment file. This is due to coreos/coreos-overlay#1002
This commit is contained in:
Thom May
2014-12-12 16:53:11 +00:00
committed by Thom May
parent 4e54447b8e
commit 9be836df31
4 changed files with 73 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
initialize/config.go
View File

@@ -113,6 +113,7 @@ func Apply(cfg config.CloudConfig, env *Environment) error {
system.OEM{OEM: cfg.Coreos.OEM},
system.Update{Update: cfg.Coreos.Update, ReadConfig: system.DefaultReadConfig},
system.EtcHosts{EtcHosts: cfg.ManageEtcHosts},
system.Flannel{Flannel: cfg.Coreos.Flannel},
} {
f, err := ccf.File()
if err != nil {
@@ -132,7 +133,6 @@ func Apply(cfg config.CloudConfig, env *Environment) error {
system.Etcd{Etcd: cfg.Coreos.Etcd},
system.Fleet{Fleet: cfg.Coreos.Fleet},
system.Locksmith{Locksmith: cfg.Coreos.Locksmith},
system.Flannel{Flannel: cfg.Coreos.Flannel},
system.Update{Update: cfg.Coreos.Update, ReadConfig: system.DefaultReadConfig},
} {
units = append(units, ccu.Units()...)