Merge lp:~jtv/maas/bug-991553 into lp:~maas-committers/maas/trunk

[Jeroen T. Vermeulen]

Documentation patch: run maas-import-isos with your current http_proxy setting.

As requested by Julian after contribution from Scott. This updates our documentation for the benefit of people who want to run maas-import-isos from behind an http proxy. Running the script in “sudo” gives it an environment without variables such as http_proxy that you might have set in your shell.

Other ways of doing this would include “sudo su” or “sudo -i” (both of which would create a root login environment, including any http_proxy setting from /etc/profile). But what if you run the script on a server that's not normally supposed to talk http to the outside world? The http_proxy setting might be local to your current shell, or might not normally be set for root. Either way, I think this spelling makes the issue explicit. Even if you simply forgot to set http_proxy, this will remind you to set it.

Jeroen

[Julian Edwards (julian-edwards)]

8 - $ sudo ./scripts/maas-import-isos
9 + $ sudo http_proxy=$http_proxy ./scripts/maas-import-isos

You could do with the same explanation of the proxy here as in INSTALL.txt, otherwise looks great, thanks!

review: Approve

[Jeroen T. Vermeulen (jtv)]

Added the explanation to HACKING.txt, though as an after-the-fact note so as not to break the flow of instructions (which should generally work anyway).

=== modified file 'HACKING.txt'
--- HACKING.txt	2012-04-27 12:53:57 +0000
+++ HACKING.txt	2012-05-02 09:31:19 +0000
@@ -157,9 +157,14 @@
 Now run ``maas-import-isos`` to download Ubuntu precise and create the
 necessary MAAS profiles::
 
-    $ sudo ./scripts/maas-import-isos
-
-Add yourself as a user in Cobbler. For convenience, give yourself the
+    $ sudo http_proxy=$http_proxy ./scripts/maas-import-isos
+
+The http_proxy variable is only needed if you're downloading through a
+proxy; "sudo" wouldn't pass it on to the script without the assignment.
+Or if you don't have it set but do want to download through a proxy, pass
+your proxy's URL: "http_proxy=http://proxy.example.com/"
+
+Now add yourself as a user in Cobbler. For convenience, give yourself the
 password ``test``::
 
     $ sudo htdigest /etc/cobbler/users.digest Cobbler $USER
 
=== modified file 'INSTALL.txt'
--- INSTALL.txt	2012-04-11 12:50:17 +0000
+++ INSTALL.txt	2012-05-02 09:31:19 +0000
@@ -87,11 +87,17 @@
 Import the Ubuntu images
 ========================
 
-MAAS will check for and download new Ubuntu images once a
-week. However, you'll need to download them manually the first time::
+MAAS will check for and download new Ubuntu images once a week.
+However, you'll need to download them manually the first time::
 
   $ sudo maas-import-isos
 
+If you are using an HTTP proxy, bear in mind that the "sudo" will not
+pass your http_proxy environment variable on to the script.  If that is
+a problem, pass it on explicitly::
+
+  $ sudo http_proxy=$http_proxy maas-import-isos
+
 
 Next steps
 ==========