Merge pull request #1407 from bcwaldon/old-data-dir

etcd: use old default data-dir format
This commit is contained in:
Brian Waldon 2014-10-24 16:44:30 -07:00
commit 2baf3e0d79
2 changed files with 2 additions and 2 deletions

2
.gitignore vendored
View File

@ -4,7 +4,7 @@
/machine* /machine*
/bin /bin
.vagrant .vagrant
*_etcd_data *.etcd
/etcd /etcd
*.swp *.swp
/hack/insta-discovery/.env /hack/insta-discovery/.env

View File

@ -146,7 +146,7 @@ func startEtcd() {
} }
if *dir == "" { if *dir == "" {
*dir = fmt.Sprintf("%v_etcd_data", *name) *dir = fmt.Sprintf("%v.etcd", *name)
log.Printf("etcd: no data-dir provided, using default data-dir ./%s", *dir) log.Printf("etcd: no data-dir provided, using default data-dir ./%s", *dir)
} }
if err := os.MkdirAll(*dir, privateDirMode); err != nil { if err := os.MkdirAll(*dir, privateDirMode); err != nil {