diff --git a/control/src/python/workspacecontrol/defaults/NetworkBootstrap.py b/control/src/python/workspacecontrol/defaults/NetworkBootstrap.py index 50861aad..c5809557 100644 --- a/control/src/python/workspacecontrol/defaults/NetworkBootstrap.py +++ b/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") diff --git a/docs/src/admin/z2c/networking-setup.html b/docs/src/admin/z2c/networking-setup.html index b6eedc89..d16f4c38 100644 --- a/docs/src/admin/z2c/networking-setup.html +++ b/docs/src/admin/z2c/networking-setup.html @@ -78,7 +78,7 @@
-include "/path/to/dhcp.entries"; +include "/path/to/dhcpd.entries";+
+ On some systems, such as Ubuntu, you may need to copy the dhcpd.entries + file to the DHCP configuration directory (/etc/dhcp3) as the daemon + will not read from other locations. +
+Alternatively you can paste the contents of that file directly inline, or use a script to generate your needed configuration from the ip_macs.txt. Once diff --git a/docs/src/admin/z2c/service-dependencies.html b/docs/src/admin/z2c/service-dependencies.html index a21e8610..dc6f3ee8 100644 --- a/docs/src/admin/z2c/service-dependencies.html +++ b/docs/src/admin/z2c/service-dependencies.html @@ -19,7 +19,7 @@
The java and javac commands should be on your path. You can check your - Java version with these command: + Java version with these commands:
$ java -version @@ -31,6 +31,17 @@Sun Java 1.5 or later
Python 2.5 or later
++ You can check the version of your system Python with this command: +
++$ python --version +++ If you cannot safely upgrade the system Python, you can use an alternate location such as + /usr/local/bin/python2.5. + You will have an opportunity to specify this alternate path during the service node install. +
Your Python must have support for sqlite 2, which is often installed separately, in a package called python-sqlite2 (Redhat) or python-pysqlite2 @@ -61,25 +72,11 @@
Apache Ant 1.6.2 or later
You must also have the propertyfile task available which is usually installed separately from Ant itself. On Redhat-compatible systems this is often a package called - ant-nodeps. On Debian/Ubuntu the package is ant-optional. You can - check your ant installation: + ant-nodeps. On Debian/Ubuntu the package is ant-optional. + To be sure, you can check for the presence of a library called ant-nodeps.jar + in your Ant installation.
--$ ant -diagnostics - -------- Ant diagnostics report ------- -Apache Ant version 1.6.5 -------------------------------------------- - Implementation Version -------------------------------------------- -core tasks : 1.6.5 -optional tasks : 1.6.5 -... --- If the "optional tasks" line does not say "not available", you should have everything needed. -
If you have all of these dependencies, you can safely move on to the next section, diff --git a/docs/src/admin/z2c/ssh-setup.html b/docs/src/admin/z2c/ssh-setup.html index 0a4f424b..9bfe8d83 100644 --- a/docs/src/admin/z2c/ssh-setup.html +++ b/docs/src/admin/z2c/ssh-setup.html @@ -69,10 +69,10 @@
SSH
-Autoconfig script
+Autoconfig
- 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 @@
Autoconfig script
$ cd $NIMBUS_HOME
-$ ./services/share/nimbus-autoconfig/autoconfig.sh +$ ./bin/nimbus-configure --autoconfig
diff --git a/docs/src/admin/z2c/vmm-setup.html b/docs/src/admin/z2c/vmm-setup.html index 60260211..c79b94d1 100644 --- a/docs/src/admin/z2c/vmm-setup.html +++ b/docs/src/admin/z2c/vmm-setup.html @@ -320,13 +320,12 @@
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
- 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 root account with password root. + 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 root account with password root. + It also runs the Nimbus context agent on boot, so you can use it to test contextualization.
nimbus $ /usr/bin/sudo /opt/nimbus/libexec/workspace-control/xen-ebtables-config.sh -ERROR: requires at least 2 arguments, syntax: add|rem[ ] +ERROR: requires at least 2 arguments, syntax: add|rem <vifname> [<macaddr> <ipaddr> [<dhcpif>]] +
@@ -634,6 +634,11 @@
+ Once you've gotten everything working, proceed to the next page where you will configure communication between + the service node and the VMM node: SSH Setup. +
+ _NIMBUS_CENTER2_COLUMN_END _NIMBUS_FOOTER1