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

Merge pull request #33 from bcwaldon/etcd-dropin-run

Browse Source 
fix(etcd): Place etcd.service drop-in in /run
This commit is contained in:
Brian Waldon 2014-03-18 10:58:34 -07:00
commit 61ffbd41c9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
initialize/etcd.go
View File

@ -37,7 +37,7 @@ func (ec EtcdEnvironment) String() (out string) {
// Write an EtcdEnvironment to the appropriate path on disk for etcd.service // Write an EtcdEnvironment to the appropriate path on disk for etcd.service
func WriteEtcdEnvironment(env EtcdEnvironment, root string) error { func WriteEtcdEnvironment(env EtcdEnvironment, root string) error {
file := system.File{ file := system.File{
Path: path.Join(root, "etc", "systemd", "system", "etcd.service.d", "20-cloudinit.conf"), Path: path.Join(root, "run", "systemd", "system", "etcd.service.d", "20-cloudinit.conf"),
RawFilePermissions: "0644", RawFilePermissions: "0644",
Content: env.String(), Content: env.String(),
} }

2
initialize/etcd_test.go
View File

@ -59,7 +59,7 @@ func TestEtcdEnvironmentWrittenToDisk(t *testing.T) {
t.Fatalf("Processing of EtcdEnvironment failed: %v", err) t.Fatalf("Processing of EtcdEnvironment failed: %v", err)
} }
fullPath := path.Join(dir, "etc", "systemd", "system", "etcd.service.d", "20-cloudinit.conf") fullPath := path.Join(dir, "run", "systemd", "system", "etcd.service.d", "20-cloudinit.conf")
fi, err := os.Stat(fullPath) fi, err := os.Stat(fullPath)
if err != nil { if err != nil {