Merge branch 'master' of github.com:nimbusproject/nimbus

control/src/python/workspacecontrol/defaults/NetworkBootstrap.py

@@ -38,7 +38,7 @@ def validate(self):
         # when localdhcp is off, the rest of the module is basically a no-op
 
         if not self.localdhcp:
-            self.c.log.warn("local DHCP is disabled. DHCP requests will hit your site DHCP server")
+            self.c.log.info("local DHCP is disabled. DHCP requests will hit your site DHCP server")
             return
 
         self.dhcpconfig = self.p.get_conf_or_none("dhcp", "dhcpconfig")

docs/src/admin/z2c/networking-setup.html

@@ -78,7 +78,7 @@ <h3>DHCP server</h3>
         MAC to IP mappings. This is generally simpler to set up and is covered in this guide.
     </li>
     <li>
-        Per-VMM -- a DHCP server installed on every VMM node and automatically configured
+        Local -- a DHCP server is installed on every VMM node and automatically configured
         with the appropriate addresses just before a VM boots. This is more complicated to
         set up initially but can be preferable in certain scenarios. It is however out of
         the scope of this guide. For details, see
@@ -149,9 +149,15 @@ <h3>DHCP server</h3>
 </p>
 
 <pre class="panel">
-include "/path/to/dhcp.entries";
+include "/path/to/dhcpd.entries";
 </pre>
 
+<p>
+    On some systems, such as Ubuntu, you may need to copy the <tt class="literal">dhcpd.entries</tt>
+    file to the DHCP configuration directory (<tt class="literal">/etc/dhcp3</tt>) as the daemon
+    will not read from other locations.
+</p>
+
 <p>
     Alternatively you can paste the contents of that file directly inline, or use a script to
     generate your needed configuration from the <tt class="literal">ip_macs.txt</tt>. Once

docs/src/admin/z2c/service-dependencies.html

@@ -19,7 +19,7 @@ <h2>Service Dependencies</h2>
 <h3>Sun Java 1.5 or later</h3>
 <p>
     The <tt class="literal">java</tt> and <tt class="literal">javac</tt> commands should be on your path. You can check your
-    Java version with these command:
+    Java version with these commands:
 </p>
 <pre class="panel">
 $ java -version
@@ -31,6 +31,17 @@ <h3>Sun Java 1.5 or later</h3>
 </p>
 
 <h3>Python 2.5 or later</h3>
+<p>
+    You can check the version of your system Python with this command:
+</p>
+<pre class="panel">
+$ python --version
+</pre>
+<p>
+    If you cannot safely upgrade the system Python, you can use an alternate location such as
+    <tt class="literal">/usr/local/bin/python2.5</tt>.
+    You will have an opportunity to specify this alternate path during the service node install.
+</p>
 <p>
     Your Python must have support for <tt class="literal">sqlite 2</tt>, which is often installed separately, in a
     package called <tt class="literal">python-sqlite2</tt> (Redhat) or <tt class="literal">python-pysqlite2</tt>
@@ -61,25 +72,11 @@ <h3>Apache Ant 1.6.2 or later</h3>
 <p>
     You must also have the <tt class="literal">propertyfile</tt> task available which
     is usually installed separately from Ant itself. On Redhat-compatible systems this is often a package called
-    <tt class="literal">ant-nodeps</tt>. On Debian/Ubuntu the package is <tt class="literal">ant-optional</tt>. You can
-    check your ant installation:
+    <tt class="literal">ant-nodeps</tt>. On Debian/Ubuntu the package is <tt class="literal">ant-optional</tt>.
+    To be sure, you can check for the presence of a library called <tt class="literal">ant-nodeps.jar</tt>
+    in your Ant installation.
 </p>
-<pre class="panel">
-$ ant -diagnostics
-
-------- Ant diagnostics report -------
-Apache Ant version 1.6.5
 
--------------------------------------------
- Implementation Version
--------------------------------------------
-core tasks     : 1.6.5
-optional tasks : 1.6.5
-...
-</pre>
-<p>
-    If the "optional tasks" line does not say "not available", you should have everything needed.
-</p>
 
 <p>
     If you have all of these dependencies, you can safely move on to the next section,

docs/src/admin/z2c/ssh-setup.html

@@ -69,10 +69,10 @@ <h3>SSH</h3>
 </p>
 
 
-<h3>Autoconfig script</h3>
+<h3>Autoconfig</h3>
 
 <p>
-    Nimbus includes an autoconfig script that checks for a properly functioning
+    Nimbus includes a configuration program that checks for a properly functioning
     SSH setup and configures your first VMM node into the service. The script
     is interactive and will go through a series of questions and tests before
     it makes any changes. If you make a mistake, just hit Ctrl-C and start
@@ -82,7 +82,7 @@ <h3>Autoconfig script</h3>
 $ cd $NIMBUS_HOME
 </pre>
 <pre class="panel">
-$ ./services/share/nimbus-autoconfig/autoconfig.sh
+$ ./bin/nimbus-configure --autoconfig
 </pre>
 
 <p>

docs/src/admin/z2c/vmm-setup.html

@@ -320,13 +320,12 @@ <h3>Obtain the sample image</h3>
 <div class="panel"><pre>
 nimbus $ cd /tmp
 nimbus $ wget http://www.nimbusproject.org/downloads/nimbus-z2c.gz
-nimbus $ md5sum nimbus-z2c.gz
-d41d8cd98f00b204e9800998ecf8427e  nimbus-z2c.gz
 nimbus $ gunzip nimbus-z2c.gz
 </pre></div>
 
 <p>
-  It is a VM with [TODO] installed.  It runs an SSH server when it boots.  If you have console access to it, you will be able to log in to it using the <tt class="literal">root</tt> account with password <tt class="literal">root</tt>.
+  It is a minimal Debian VM with very little installed.  It runs an SSH server when it boots.  If you have console access to it, you will be able to log in to it using the <tt class="literal">root</tt> account with password <tt class="literal">root</tt>.
+    It also runs the Nimbus context agent on boot, so you can use it to test contextualization.
 </p>
 
 <h3>Configure default bridge</h3>
@@ -376,7 +375,8 @@ <h3>Configure sudo and ebtables script</h3>
 
 <div class="panel"><pre>
 nimbus $ /usr/bin/sudo /opt/nimbus/libexec/workspace-control/xen-ebtables-config.sh
-ERROR: requires at least 2 arguments, syntax: add|rem <vifname> [<dhcpif>  <macaddr> <ipaddr>]
+ERROR: requires at least 2 arguments, syntax: add|rem &lt;vifname&gt; [&lt;macaddr&gt; &lt;ipaddr&gt; [&lt;dhcpif&gt;]]
+
 </pre></div>
 
 <p>
@@ -634,6 +634,11 @@ <h3>Final test: VM creation using workspace-control</h3>
   If putting the culprit error into a search engine does not produce any obvious answers, don't hesitate to contact the <a href="_NIMBUS_WEBSITE/contact/">workspace-user</a> mailing list.  Describe your situation and any errors you are seeing.  Attaching this debug log and including version information (of the VMM and libvirt and your OS) can often be helpful and reduce the amount of emails that need to occur.
 </p>
 
+<p>
+    Once you've gotten everything working, proceed to the next page where you will configure communication between
+    the service node and the VMM node: <a href="ssh-setup.html">SSH Setup</a>.
+</p>
+
 
 _NIMBUS_CENTER2_COLUMN_END
 _NIMBUS_FOOTER1