machine names

diff --git a/installation-plan/setup-info.xls b/installation-plan/setup-info.xls
index 9d1f65edbe76a318f0fc198787cc23c5cf07a030..2be76334aff945c93c1a1e98a4044640bb208ab7 100644 (file)
Binary files a/installation-plan/setup-info.xls and b/installation-plan/setup-info.xls differ

diff --git a/plumbing.txt b/plumbing.txt
index 66065f43177ce24f768aadcde654517517d34ae4..1d7b2e6e480d752f2fe6227a847714e7fc1ef8a0 100644 (file)
--- a/plumbing.txt
+++ b/plumbing.txt
@@ -13,11 +13,12 @@ Each test box would be connected to one of alice's the comtrol panel
 ports.  Initially we will have <32 servers so they will all be
 connected to the same comtrol panel, connected to alice.
 
-If alice, or alice's comtrol card, dies, we swap over
+If newcastle, or newcastle's comtrol card, dies, we swap over
   - the port 0's of the two comtrol panels
   - the two cables betwen the comtrol panels and the servers
-leaving alice and bob's ttyS0's still connected to the each other's
-comtrol port 0, but all the test boxes connected to bob.
+leaving newcastle and gateshead's ttyS0's still connected to the
+each other's comtrol port 0, but all the test boxes connected to
+gateshead.
 
 
            -----+-----------------------------------+---------> global internet
@@ -30,7 +31,7 @@ comtrol port 0, but all the test boxes connected to bob.
 |   |           |eth0                               |eth0                 |   |
 |   |dfl  +========================+     +==========================+  dfl|   |
 |   |ON   |                        |     |                          |   ON|   |
-|   |.....|   bob                  |     |       alice              |.....|   |
+|   |.....|   gateshead            |     |       newcastle          |.....|   |
 |   |0    |   Main server #2       |     |       Main server #1     |    0|   |
 |   |     |                        |     |                          |     |   |
 |   |     +========================+     +==========================+     |   |
@@ -41,7 +42,7 @@ comtrol port 0, but all the test boxes connected to bob.
 |PDU|       |    ::           `          '              ::        |       |PDU|
 |#2 |       |    ::            `        '               ::        |       |#1 |
 |   |       |    ::             `      '                ::        |       |   |
-|   |       |    ::  "bob"       `    '     "alice"     ::        |       |   |
+|   |       |    ::  "gateshead" `    '     "newcastle" ::        |       |   |
 |   |       |    ::comtrol panel  `  '     comtrol panel::        |       |   |
 |   |       |    [0][1][2][3][4].. `'      [0][1][2][3][4]..      |       |   |
 |   |       |     .                '`       .  .  .  .  .         |       |   |
@@ -76,7 +77,7 @@ I think the internal network needs to have two VLANs:
 
  * Infrastructure vlan (172.16.148.0/24)
      Used for sshing between various service VMs.
-     Data migration between alice and bob
+     Data migration between newcastle and gateshead
      PDU
 
  * Test vlan (172.16.144.0/22)
@@ -102,7 +103,8 @@ We will need the following VMs, all Debian amd64:
   * infra        dhcpd (isc), internal DNS, etc.            [infra]
 For completeness I also list
   + test boxes                                              [test]
-  + alice, bob   main server physical hardware              [test infra ext]
+  + newcastle,
+    gateshead    main server physical hardware              [test infra ext]
 
 The two VMs marked [ext] need to provide service on a stable public IP
 address.  This could be achieved by giving them a public IP address

diff --git a/selections.ods b/selections.ods
index 77f4746cb2c0ad27e997d6750cbcb80e54a25b6d..91dc9c94e4ea91a648512e3098ae9d3f0c8ea2c1 100644 (file)
Binary files a/selections.ods and b/selections.ods differ