Merge lp:~jameinel/juju-core/1.18-always-ensure-curl-1300321 into lp:juju-core/1.18

[John A Meinel]

cloudinit: always install curl

Our cloud images always come with curl installed, but manual instances may
not (bug #1300321). It doesn't hurt to install a package that is already
there, so this is a trivial patch to just depend on having curl installed.

https://codereview.appspot.com/83250044/

cloudinit: always install curl

Our cloud images always come with curl installed, but manual instances may
not (bug #1300321). It doesn't hurt to install a package that is already
there, so this is a trivial patch to just depend on having curl installed.

https://codereview.appspot.com/83250044/

[John A Meinel (jameinel)]

Reviewers: mp+213837_code.launchpad.net,

Message:
Please take a look.

Description:
cloudinit: always install curl

Our cloud images always come with curl installed, but manual instances
may
not (bug #1300321). It doesn't hurt to install a package that is already
there, so this is a trivial patch to just depend on having curl
installed.

https://code.launchpad.net/~jameinel/juju-core/1.18-always-ensure-curl-1300321/+merge/213837

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/83250044/

Affected files (+3, -0 lines):
   A [revision details]
   M environs/cloudinit/cloudinit.go

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-20140402091849-omo4q058vgwqp3oo
+New revision: <email address hidden>

Index: environs/cloudinit/cloudinit.go
=== modified file 'environs/cloudinit/cloudinit.go'
--- environs/cloudinit/cloudinit.go 2014-03-24 04:05:24 +0000
+++ environs/cloudinit/cloudinit.go 2014-04-02 11:58:30 +0000
@@ -221,6 +221,7 @@

   // juju requires git for managing charm directories.
   c.AddPackage("git")
+ c.AddPackage("curl")
   c.AddPackage("cpu-checker")
   c.AddPackage("bridge-utils")
   c.AddPackage("rsyslog-gnutls")

[Martin Packman (gz)]

LGTM. Ugh. Dimiter had this in the initial version, but I got him to
remove it as it's redundant for anyone actually using our stuff. And of
course, someone breaks from not using our cloud-images.

https://codereview.appspot.com/83250044/

[Dave Cheney (dave-cheney)]

On 2014/04/02 13:13:32, gz wrote:
> LGTM. Ugh. Dimiter had this in the initial version, but I got him to
remove it
> as it's redundant for anyone actually using our stuff. And of course,
someone
> breaks from not using our cloud-images.

LGTM. I agree with your diagnosis

https://codereview.appspot.com/83250044/

=== modified file 'environs/cloudinit/cloudinit.go'
--- environs/cloudinit/cloudinit.go	2014-03-24 04:05:24 +0000
+++ environs/cloudinit/cloudinit.go	2014-04-02 12:47:02 +0000
@@ -221,6 +221,7 @@
 
 	// juju requires git for managing charm directories.
 	c.AddPackage("git")
+	c.AddPackage("curl")
 	c.AddPackage("cpu-checker")
 	c.AddPackage("bridge-utils")
 	c.AddPackage("rsyslog-gnutls")