Skip to content

Commit 302429a

Browse files
committed
Remove the step logging to info, to clean up
Outputting the steps made the driver look hacky to users, and probably isn't needed unless debugging something new.
1 parent 76a49fc commit 302429a

File tree

1 file changed

+0
-16
lines changed

1 file changed

+0
-16
lines changed

qemu.go

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -526,55 +526,44 @@ func (d *Driver) generateDiskImage(size int) error {
526526
if err := tw.WriteHeader(file); err != nil {
527527
return err
528528
}
529-
log.Infof("1")
530529
if _, err := tw.Write([]byte(magicString)); err != nil {
531530
return err
532531
}
533532
// .ssh/key.pub => authorized_keys
534-
log.Infof("2")
535533
file = &tar.Header{Name: ".ssh", Typeflag: tar.TypeDir, Mode: 0700}
536534
if err := tw.WriteHeader(file); err != nil {
537535
return err
538536
}
539-
log.Infof("3")
540537
pubKey, err := ioutil.ReadFile(d.publicSSHKeyPath())
541538
if err != nil {
542539
return err
543540
}
544-
log.Infof("4")
545541
file = &tar.Header{Name: ".ssh/authorized_keys", Size: int64(len(pubKey)), Mode: 0644}
546542
if err := tw.WriteHeader(file); err != nil {
547543
return err
548544
}
549-
log.Infof("5")
550545
if _, err := tw.Write([]byte(pubKey)); err != nil {
551546
return err
552547
}
553-
log.Infof("6")
554548
file = &tar.Header{Name: ".ssh/authorized_keys2", Size: int64(len(pubKey)), Mode: 0644}
555549
if err := tw.WriteHeader(file); err != nil {
556550
return err
557551
}
558-
log.Infof("7")
559552
if _, err := tw.Write([]byte(pubKey)); err != nil {
560553
return err
561554
}
562-
log.Infof("8")
563555
if err := tw.Close(); err != nil {
564556
return err
565557
}
566-
log.Infof("9")
567558
rawFile := fmt.Sprintf("%s.raw", d.diskPath())
568559
if err := ioutil.WriteFile(rawFile, buf.Bytes(), 0644); err != nil {
569560
return nil
570561
}
571-
log.Infof("10")
572562
if stdout, stderr, err := cmdOutErr("qemu-img", "convert", "-f", "raw", "-O", "qcow2", rawFile, d.diskPath()); err != nil {
573563
fmt.Printf("OUTPUT: %s\n", stdout)
574564
fmt.Printf("ERROR: %s\n", stderr)
575565
return err
576566
}
577-
log.Infof("11")
578567
if stdout, stderr, err := cmdOutErr("qemu-img", "resize", d.diskPath(), fmt.Sprintf("+%dMB", size)); err != nil {
579568
fmt.Printf("OUTPUT: %s\n", stdout)
580569
fmt.Printf("ERROR: %s\n", stderr)
@@ -588,27 +577,22 @@ func (d *Driver) generateDiskImage(size int) error {
588577
func (d *Driver) generateUserdataDisk(userdataFile string) (string, error) {
589578
// Start with virtio, add ISO & FAT format later
590579
// Start with local file, add wget/fetct URL? (or if URL, use datasource..)
591-
log.Infof("1")
592580
userdata, err := ioutil.ReadFile(userdataFile)
593581
if err != nil {
594582
return "", err
595583
}
596584

597-
log.Infof("2")
598585
machineDir := filepath.Join(d.StorePath, "machines", d.GetMachineName())
599586
ccRoot := filepath.Join(machineDir, "cloud-config")
600587
os.MkdirAll(ccRoot, 0755)
601588

602-
log.Infof("3")
603589
userDataDir := filepath.Join(ccRoot, "openstack/latest")
604590
os.MkdirAll(userDataDir, 0755)
605591

606-
log.Infof("4")
607592
writeFile := filepath.Join(userDataDir, "user_data")
608593
if err := ioutil.WriteFile(writeFile, userdata, 0644); err != nil {
609594
return "", err
610595
}
611-
log.Infof("5")
612596

613597
return ccRoot, nil
614598

0 commit comments

Comments
 (0)