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

Merge pull request #267 from thommay/flannel_unit

Browse Source 
the flannel service is called flanneld
This commit is contained in:
Eugene Yakubovich 2014-11-25 12:30:58 -08:00
commit 4e466c12da
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
system/flannel.go
View File

@ -13,5 +13,5 @@ type Flannel struct {
// Units generates a Unit file drop-in for flannel, if any flannel options were // Units generates a Unit file drop-in for flannel, if any flannel options were
// configured in cloud-config // configured in cloud-config
func (fl Flannel) Units() []Unit { func (fl Flannel) Units() []Unit {
return dropinFromConfig(fl.Flannel, "flannel.service") return dropinFromConfig(fl.Flannel, "flanneld.service")
} }

2
system/flannel_test.go
View File

@ -22,7 +22,7 @@ func TestFlannelUnits(t *testing.T) {
EtcdPrefix: "/coreos.com/network/tenant1", EtcdPrefix: "/coreos.com/network/tenant1",
}, },
[]Unit{{config.Unit{ []Unit{{config.Unit{
Name: "flannel.service", Name: "flanneld.service",
Content: `[Service] Content: `[Service]
Environment="FLANNELD_ETCD_ENDPOINT=http://12.34.56.78:4001" Environment="FLANNELD_ETCD_ENDPOINT=http://12.34.56.78:4001"
Environment="FLANNELD_ETCD_PREFIX=/coreos.com/network/tenant1" Environment="FLANNELD_ETCD_PREFIX=/coreos.com/network/tenant1"