number and flatten the new-node procedure

tsa/howto/ganeti.mdwn

@@ -797,78 +797,79 @@ catastrophic data loss bug in Ganeti or [[drbd]].
 
 ### New node
 
-- To create a new box, follow [[new-machine-hetzner-robot]] but change
-  the following settings:
+ 1. To create a new box, follow [[new-machine-hetzner-robot]] but change
+    the following settings:
 
-  * Server: [PX62-NVMe][]
-  * Location: `FSN1`
-  * Operating system: Rescue
-  * Additional drives: 2x10TB HDD (update: starting from fsn-node-05,
-    we are *not* ordering additional drives to save on costs, see
-    [ticket 33083](https://trac.torproject.org/projects/tor/ticket/33083) for rationale)
-  * Add in the comment form that the server needs to be in the same
-    datacenter as the other machines (FSN1-DC13, but double-check)
+    * Server: [PX62-NVMe][]
+    * Location: `FSN1`
+    * Operating system: Rescue
+    * Additional drives: 2x10TB HDD (update: starting from fsn-node-05,
+      we are *not* ordering additional drives to save on costs, see
+      [ticket 33083](https://trac.torproject.org/projects/tor/ticket/33083) for rationale)
+    * Add in the comment form that the server needs to be in the same
+      datacenter as the other machines (FSN1-DC13, but double-check)
 
-[PX62-NVMe]: https://www.hetzner.com/dedicated-rootserver/px62-nvme?country=OTHER
+ [PX62-NVMe]: https://www.hetzner.com/dedicated-rootserver/px62-nvme?country=OTHER
 
-- follow the [[new-machine]] post-install configuration
+ 2. follow the [[new-machine]] post-install configuration
 
-- Network setup:
+ 3. Add the server to the two `vSwitch` systems in [Hetzner Robot web
+    UI](https://robot.your-server.de/vswitch)
 
-  1. Add the server to the two `vSwitch` systems in [Hetzner Robot web UI](https://robot.your-server.de/vswitch)
+ 4. install openvswitch and allow modules to be loaded:
 
-  2. install openvswitch and allow modules to be loaded
+        touch /etc/no_modules_disabled
+        reboot
+        apt install openvswitch-switch
 
-         touch /etc/no_modules_disabled
-         reboot
-         apt install openvswitch-switch
-
-  3. Allocate a private IP address in the `30.172.in-addr.arpa` zone for
-     the node.
+ 5. Allocate a private IP address in the `30.172.in-addr.arpa` zone for
+    the node.
 
-  4. copy over the `/etc/network/interfaces` from another ganeti node,
-     changing the `address` and `gateway` fields to match the local
-     entry.
+ 6. copy over the `/etc/network/interfaces` from another ganeti node,
+    changing the `address` and `gateway` fields to match the local
+    entry.
 
-  5. knock on wood, cross your fingers, pet a cat, help your local
-     book store, and reboot:
+ 7. knock on wood, cross your fingers, pet a cat, help your local
+    book store, and reboot:
   
          reboot
 
-- Prepare all the nodes by configuring them in puppet.  They should be
-  in the class `roles::ganeti::fsn` if they are part of the fsn
-  cluster.
+ 8. Prepare all the nodes by configuring them in puppet.  They should
+    be in the class `roles::ganeti::fsn` if they are part of the fsn
+    cluster.
 
-- Re-enable modules disabling:
+ 9. Re-enable modules disabling:
 
         rm /etc/no_modules_disabled
 
-- reboot again
-
-Then the node is ready to be added to the cluster, by running this on
-the master node:
-
-    puppet agent -t
-    gnt-node add \
-      --secondary-ip 172.30.135.2 \
-      --no-ssh-key-check \
-      --no-node-setup \
-      fsn-node-02.torproject.org
-
-If this is an entirely new cluster, you need a different procedure:
-
-    gnt-cluster init \
-      --master-netdev vlan-gntbe \
-      --vg-name vg_ganeti \
-      --secondary-ip 172.30.135.1 \
-      --enabled-hypervisors kvm \
-      --nic-parameters link=br0,vlan=4000 \
-      --mac-prefix 00:66:37 \
-      --no-ssh-init \
-      --no-etc-hosts \
-      fsngnt.torproject.org
-
-The above assumes that `fsngnt` is already in DNS.
+ 10. reboot again:
+ 
+        reboot
+
+ 11. Then the node is ready to be added to the cluster, by running
+     this on the master node:
+
+        puppet agent -t
+        gnt-node add \
+          --secondary-ip 172.30.135.2 \
+          --no-ssh-key-check \
+          --no-node-setup \
+          fsn-node-02.torproject.org
+
+    If this is an entirely new cluster, you need a different procedure:
+
+        gnt-cluster init \
+          --master-netdev vlan-gntbe \
+          --vg-name vg_ganeti \
+          --secondary-ip 172.30.135.1 \
+          --enabled-hypervisors kvm \
+          --nic-parameters link=br0,vlan=4000 \
+          --mac-prefix 00:66:37 \
+          --no-ssh-init \
+          --no-etc-hosts \
+          fsngnt.torproject.org
+    
+    The above assumes that `fsngnt` is already in DNS.
 
 ### cluster config