Merge pull request #1585 from endocode/dongsu/config-cloudinit-fxtests

Dongsu Park · Dongsu Park · commit 56b539fc4be7 · 2016-05-23T19:57:20.000+02:00
functional: fix path to user_data to /var/lib/coreos-install
diff --git a/functional/platform/nspawn.go b/functional/platform/nspawn.go
@@ -344,7 +344,7 @@ func (nc *nspawnCluster) insertBin(src string, dst string) error {
 }
 
 func (nc *nspawnCluster) buildConfigDrive(dir, ip string) error {
-	latest := path.Join(dir, "media/configdrive/openstack/latest")
+	latest := path.Join(dir, "var/lib/coreos-install")
 	userPath := path.Join(latest, "user_data")
 	if err := os.MkdirAll(latest, 0755); err != nil {
 		return err

Original file line number	Diff line number	Diff line change
`@@ -344,7 +344,7 @@ func (nc *nspawnCluster) insertBin(src string, dst string) error {`
`344`	`344`	`}`
`345`	`345`
`346`	`346`	`func (nc *nspawnCluster) buildConfigDrive(dir, ip string) error {`
`347`		`- latest := path.Join(dir, "media/configdrive/openstack/latest")`
	`347`	`+ latest := path.Join(dir, "var/lib/coreos-install")`
`348`	`348`	`userPath := path.Join(latest, "user_data")`
`349`	`349`	`if err := os.MkdirAll(latest, 0755); err != nil {`
`350`	`350`	`return err`