Set MAC addresses on gate's network interfaces, else they're random.

Set corresponding example variable values.  Simplify test instructions.

diff --git a/README.org b/README.org
index da4f608593fff4e04ff1f04f01c7e166bd17d32b..6be24745b10e72cb63af50fca818797ae0775037 100644 (file)
--- a/README.org
+++ b/README.org
@@ -4732,9 +4732,9 @@ example code here.
 
 #+CAPTION: [[file:private/vars.yml][=private/vars.yml=]]
 #+BEGIN_SRC conf :tangle private/vars.yml
-gate_lan_mac:               ff:ff:ff:ff:ff:ff
-gate_wifi_mac:              ff:ff:ff:ff:ff:ff
-gate_isp_mac:               ff:ff:ff:ff:ff:ff
+gate_lan_mac:               08:00:27:f3:16:79
+gate_isp_mac:               08:00:27:3d:42:e5
+gate_wifi_mac:              08:00:27:4a:de:d2
 #+END_SRC
 
 The following tasks install the two configuration files and apply the
@@ -6978,19 +6978,16 @@ connected it to ~vboxnet0~.  The ~isp~ and ~wifi~ interfaces are also
 connected to the simulated ISP and campus wireless access point.
 
 #+BEGIN_SRC sh
-VBoxManage modifyvm gate --nic1 hostonly
-VBoxManage modifyvm gate --hostonlyadapter1 vboxnet0
+VBoxManage modifyvm gate --mac-address1=080027f31679
+VBoxManage modifyvm gate --nic1 hostonly --hostonlyadapter1 vboxnet0
+VBoxManage modifyvm gate --mac-address2=0800273d42e5
 VBoxManage modifyvm gate --nic2 natnetwork --natnetwork2 premises
-VBoxManage modifyvm gate --nic3 hostonly
-VBoxManage modifyvm gate --hostonlyadapter3 vboxnet1
+VBoxManage modifyvm gate --mac-address3=0800274aded2
+VBoxManage modifyvm gate --nic3 hostonly --hostonlyadapter3 vboxnet1
 #+END_SRC
 
-Before rebooting, the MAC addresses of the three network interfaces
-should be compared to the example variable settings in [[file:hosts][=hosts=]].  The
-values of the ~gate_lan_mac~, ~gate_wifi_mac~, and ~gate_isp_mac~
-variables /must/ agree with the MAC addresses assigned to the virtual
-machine's network interfaces.  The following table assumes device
-names that may vary depending on the hypervisor, version, etc.
+The MAC addresses above were specified so they match the example
+values of the MAC address variables in this table.
 
 | device   | network    | simulating      | MAC address variable |
 |----------+------------+-----------------+----------------------|

diff --git a/private/vars.yml b/private/vars.yml
index 54ca554e0bd78bcb0c662a8c569734a8f027c142..5ed9058d9df0741a6a27bb3d5369acaf7ac3a036 100644 (file)
--- a/private/vars.yml
+++ b/private/vars.yml
@@ -42,9 +42,9 @@ nextcloud_dbpass:           ippAgmaygyob
 
 nextcloud_region:           US
 
-gate_lan_mac:               ff:ff:ff:ff:ff:ff
-gate_wifi_mac:              ff:ff:ff:ff:ff:ff
-gate_isp_mac:               ff:ff:ff:ff:ff:ff
+gate_lan_mac:               08:00:27:f3:16:79
+gate_isp_mac:               08:00:27:3d:42:e5
+gate_wifi_mac:              08:00:27:4a:de:d2
 
 wifi_wan_mac:               94:83:c4:19:7d:57
 wifi_wan_name:              campus-wifi-ap