Slide adjustments

ramereth · Jul 19, 2011 · c093882 · c093882
1 parent 4b100c1
commit c093882
Show file tree

Hide file tree

Showing 10 changed files with 70 additions and 24 deletions.
diff --git a/ending/1_ending.md b/ending/1_ending.md
@@ -30,4 +30,4 @@ Presentation made with **_showoff_**
 
 http://github.com/ramereth/presentation-ganeti-tutorial
 
-#### http://is.gd/osbganeti | http://is.gd/osbganetipdf
+#### http://is.gd/osconganeti | http://is.gd/osconganetipdf
diff --git a/hands_on_setup/1_summary.md → hands_on_import/1_summary.md b/hands_on_setup/1_summary.md → hands_on_import/1_summary.md
@@ -3,7 +3,7 @@
 # Hands-on Tutorial
 
 * _Debian_ VMs with VirtualBox
-* Pre-setup using _Puppet_
+* Pre-setup already using _Puppet_
 * Setup Guide PDF
 * Hands-on is _optional_
 
@@ -12,5 +12,5 @@
 # Importing VMs
 
 * Install _VirtualBox_
-* Import node1/2 (node3 is optional)
+* Import _node1/2_ (node3 is optional)
 * _USB drives_ are available with images
diff --git a/hands_on_setup/0_intro.md b/hands_on_setup/0_intro.md
@@ -0,0 +1,3 @@
+!SLIDE subsec
+
+# Hands-on Setup
diff --git a/installing_ganeti/4_initialize_ganeti.md b/installing_ganeti/4_initialize_ganeti.md
@@ -20,33 +20,33 @@
 ### KVM example
 
     $ gnt-cluster init \
-        --master-netdev=br42 \
+        --master-netdev=br0 \
         --vg-name ganeti \
-        --secondary-ip 192.168.16.140 \
+        --secondary-ip 192.168.16.16 \
         --enabled-hypervisors=kvm \
-        --nic-parameters link=br100 \
+        --nic-parameters link=br0 \
         --backend-parameters \
-            vcpus=2,memory=512M \
+            vcpus=1,memory=128M \
         --hypervisor-parameters \
-            kvm:kernel_path=/boot/guest/vmlinuz \
+            kvm:kernel_path=/boot/vmlinuz-2.6-kvmU \
             vnc_bind_address=0.0.0.0 \
-        ganeti-prod.example.org
+        ganeti.example.org
 
 !SLIDE codeblock rvc bigcode smtitle
 
 # Cluster init args
 
 ### Master Network Device
 
-    --master-netdev=br42
+    --master-netdev=br0
 
 ### Volume Group Name
 
     --vg-name ganeti
 
 ### DRBD Interface
 
-    --secondary-ip 192.168.16.140
+    --secondary-ip 192.168.16.16
 
 ### Enabled Hypervisors
 
@@ -58,18 +58,23 @@
 
 ### Default NIC
 
-    --nic-parameters link=br100
+    --nic-parameters link=br0
 
 ### Default Backend parameters
 
-    --backend-parameters vcpus=2,memory=512M
+    --backend-parameters vcpus=1,memory=128M
 
 ### Default Hypervisor Parameters
 
     --hypervisor-parameters \
-        kvm:kernel_path=/boot/guest/vmlinuz-guest, \
+        kvm:kernel_path=/boot/vmlinuz-2.6-kvmU, \
         vnc_bind_address=0.0.0.0 \
 
 ### Cluster hostname
 
-    ganeti-prod.example.org
+    ganeti.example.org
+
+!SLIDE subsec
+
+# Hands on
+## Ganeti Initialization
diff --git a/planning_your_cluster/1_hardware_planning.md b/planning_your_cluster/1_hardware_planning.md
@@ -16,7 +16,7 @@
 
 * **Cores:** More = better
 * **Speed:** Depends on your uses
-* **Brand:** AMD vs Intel = use case
+* **Brand:** AMD vs Intel
 
 !SLIDE bullets rvc
 
@@ -26,3 +26,13 @@
 
 * **Amount:** More = better
 * **Use case:** Types of services
+
+!SLIDE bullets rvc
+
+# Other considerations
+
+* **RAID**
+* **Redundant** Power
+* Higher **Density**
+* More **nodes**
+* **Network** topology
diff --git a/planning_your_cluster/3_network.md b/planning_your_cluster/3_network.md
@@ -1,9 +1,9 @@
 !SLIDE bullets center himg
 
-# Network Planning
+# Networking
 
 ![networking](networking.png)
 
-* _Bridging_ is most supported
+* _Bridging_ is most widely used
 * _Routed_ networking also supported
-* Nodes on _private NAT_
+* Nodes on _private NAT/VLAN_
diff --git a/preinstallation_steps/3_installing_drbd.md b/preinstallation_steps/3_installing_drbd.md
@@ -4,7 +4,7 @@
 
 ![drbd](drbd.png)
 
-* RAID1 over the network
+* **RAID1** over the network
 
 !SLIDE bullets list
 

diff --git a/showoff.json b/showoff.json
@@ -1,10 +1,11 @@
 {   "name": "Hands on Virtualization with Ganeti",
     "sections": [ 
         {"section":"start"},
-        {"section":"hands_on_setup"},
+        {"section":"hands_on_import"},
         {"section":"introduction"},
         {"section":"terminology"},
         {"section":"planning_your_cluster"},
+        {"section":"hands_on_setup"},
         {"section":"preinstallation_steps"},
         {"section":"installing_ganeti"},
         {"section":"instance_management"},
@@ -14,9 +15,6 @@
         {"section":"htools"},
         {"section":"rapi"},
         {"section":"project_roadmap"},
-        {"section":"gwm_overview"},
-        {"section":"gwm_install"},
-        {"section":"gwm_demo"},
         {"section":"ending"}
     ]
 }
diff --git a/start/2_bios.md b/start/2_bios.md
@@ -7,3 +7,13 @@
 * Open Source development projects
 * **Lance** / Lead Systems Administrator
 * **Peter** / Lead Software Engineer
+
+!SLIDE bullets list
+
+# How we use Ganeti
+
+* _Powers_ all OSUOSL virtualization
+* Project hosting
+* _KVM_ based
+* _Hundreds_ of VMs
+* Web hosts, code hosting, etc
diff --git a/terminology/4_instance.md b/terminology/4_instance.md
@@ -18,6 +18,26 @@
 
 !SLIDE bullets list
 
+# hvparams
+
+* Boot order, CDROM Image
+* NIC Type, Disk Type
+* VNC Parameters, Serial console
+* Kernel Path, initrd, args
+* Other Hypervisor specific parameters
+
+!SLIDE bullets list
+
+# beparams
+# nicparams
+
+* Memory / Virtual CPUs
+* MAC
+* NIC mode (routed or bridged)
+* Link
+
+!SLIDE bullets list
+
 # Disk template
 
 * **drbd** : LVM + DRBD between 2 nodes