Added explicit MAC docs to network pool samples

nimbusproject · Jul 6, 2010 · 91e6c57 · 91e6c57
1 parent 094e754
commit 91e6c57
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/service/service/java/source/etc/workspace-service/network-pools/private b/service/service/java/source/etc/workspace-service/network-pools/private
@@ -3,7 +3,7 @@
 # DNS IP address (or 'none'):
 4.2.2.1
 
-# hostname ipaddress gateway broadcast subnetmask
+# hostname ipaddress gateway broadcast subnetmask [MAC]
 
 priv002 172.20.6.2 172.20.6.1 172.20.6.255 255.255.255.0
 priv003 172.20.6.3 172.20.6.1 172.20.6.255 255.255.255.0

diff --git a/service/service/java/source/etc/workspace-service/network-pools/public b/service/service/java/source/etc/workspace-service/network-pools/public
@@ -9,19 +9,32 @@
 # The rest of the file's non-blank, non-comment lines are the addresses
 # that will be leased out to VMs requesting this network.
 
-# Currently there are no syntax shortcuts, each field must have an entry
-# or the keyword 'none'.
+# The only optional field is the MAC address. All others must be a valid
+# entry or 'none'.
 
 # The IP address and hostname fields may not be 'none'.
 # If the gateway is 'none', no gateway is assigned.
 # If broadcast or subnetmask are 'none' they are derived from the IP
 #   - based on the normal subnet and broadcast for the IP class (A,B,C)
 
+# An explicit MAC address may be optionally specified for an entry. The
+# MAC must be specified as six pairs of hex digits, separated by colons.
+# If you do not specify a MAC, one will be automatically generated when
+# Nimbus is started.
 
-# hostname ipaddress gateway broadcast subnetmask
+# A file containing sample DHCP entries is written by the Nimbus service
+# to $NIMBUS_HOME/services/var/nimbus/dhcpd.entries
+# This file contains the generated and explicit IP -> MAC mappings and
+# can be included in your site DHCPD configuration. There is also a
+# simple text mapping of IP -> MAC written to the ip_mac.txt file in the
+# same directory.
+
+
+
+# hostname ipaddress gateway broadcast subnetmask [MAC]
 
 pub02 192.168.0.2 192.168.0.1 none none
-pub03 192.168.0.3 192.168.0.1 192.168.0.255 255.255.255.0
+pub03 192.168.0.3 192.168.0.1 192.168.0.255 255.255.255.0 A2:AA:BB:EE:5F:2A
 pub04 192.168.0.4 192.168.0.1 192.168.0.255 255.255.255.0
 pub05 192.168.0.5 192.168.0.1 none none
 pub06 192.168.0.6 none none none