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

etcd: use old default data-dir format

.gitignore

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

main.go

@@ -146,7 +146,7 @@ func startEtcd() {
 	}
 
 	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)
 	}
 	if err := os.MkdirAll(*dir, privateDirMode); err != nil {