Index: environs/cloudinit/cloudinit.go |
=== modified file 'environs/cloudinit/cloudinit.go' |
--- environs/cloudinit/cloudinit.go 2013-04-19 16:55:38 +0000 |
+++ environs/cloudinit/cloudinit.go 2013-04-22 20:34:59 +0000 |
@@ -106,12 +106,6 @@ |
if err := verifyConfig(cfg); err != nil { |
return nil, err |
} |
- // TODO(dimitern) this is needed for raring, due to LP bug #1103881 |
- if cfg.Tools.Series == "raring" { |
- addScripts(c, "apt-get upgrade -y") |
- } else { |
- c.SetAptUpgrade(true) |
- } |
c.AddSSHAuthorizedKeys(cfg.AuthorizedKeys) |
c.AddPackage("git") |
@@ -184,9 +178,9 @@ |
} |
// general options |
+ c.SetAptUpgrade(true) |
c.SetAptUpdate(true) |
c.SetOutput(cloudinit.OutAll, "| tee -a /var/log/cloud-init-output.log", "") |
- |
return c, nil |
} |