MAC discovery info, Calculation correx, typos

docs/pages/installation-instructions/0015-before-you-start.rst

@@ -12,7 +12,7 @@ decisions:
 * **Cobbler server and Puppet Master.** The heart of a Fuel install is the combination of Puppet Master and Cobbler used to create your resources. Although Cobbler and Puppet Master can be installed on separate machines, it is common practice to install both on a single machine for small to medium size clouds, and that's what we'll be doing in this example.  (By default, the Fuel ISO creates a single server with both services.)
 
 * **Domain name.** Puppet clients generate a Certificate Signing Request (CSR), which is then signed by Puppet Master. The signed certificate can then be used to authenticate the client during provisioning. Certificate generation requires a fully qualified hostname, so you must choose a domain name to be used in your installation. We'll leave this up to you.
-* **Network addresses.** OpenStack requires a minimum of three networks. If you are deploying on physical hardware two of them -- the public network and the internal, or management network -- must be routable in your networking infrastructure. Also, if you intend for your cluster to be accessible from the Internet, you'll want the public network to be on the proper network segment.  For simplicity in this case, this example assumes an Internet router at 192.168.0.1.  Additionally, a set of private network addresses should be selected for automatic assignment to guest VMs. (These are fixed IPs for the private network). In our case, we are allocating network addresses as follows:
+* **Network addresses.** OpenStack requires a minimum of three networks. If you are deploying on physical hardware two of them -- the public network and the internal, or management network -- must be routable in your networking infrastructure. Also, if you intend for your cluster to be accessible from the Internet, you'll want the public network to be on the proper network segment.  For simplicity in this case, this example assumes an Ineternet router at 192.168.0.1.  Additionally, a set of private network addresses should be selected for automatic assignment to guest VMs. (These are fixed IPs for the private network). In our case, we are allocating network addresses as follows:
 
     * Public network: 192.168.0.0/24
     * Internal network: 10.20.0.0/24

docs/pages/installation-instructions/0020-machines.rst

@@ -102,7 +102,7 @@ the network from Cobbler. You'll also need each server's mac address.
 If you're using VirtualBox, you will need to create the corresponding
 virtual machines for your OpenStack nodes. Follow these instructions
 to create machines named fuel-controller-01, fuel-controller-02, fuel-
-controller-03, and fuel-compute-02, but do not start them yet.
+controller-03, and fuel-compute-01, but do not start them yet.
 
 
 

docs/pages/installation-instructions/0050-configuring-cobbler.rst

@@ -31,7 +31,7 @@ Change the virtual IPs to match the target networks, and set the fixed and float
      nv_physical_volumes:
       - /dev/sdb
 
-By setting the ``nv_physical_volumes`` value, you are not only telling OpenStack to use this value for Cinder (you'll see more aobut that in the ``site.pp`` file), you're also telling Fuel to create and mount the appropriate partition.
+By setting the ``nv_physical_volumes`` value, you are not only telling OpenStack to use this value for Cinder (you'll see more about that in the ``site.pp`` file), you're also telling Fuel to create and mount the appropriate partition.
 
 Later, we'll set up a new partition for Cinder, so tell Cobbler to create it here. ::
 
@@ -188,7 +188,11 @@ Next you'll define the actual servers. ::
 	      userctl: "yes"
 	      peerdns: "no"
 
-You can retrieve the MAC ids for your network adapters by expanding "Advanced" for the adapater in VirtualBox, or by executing ifconfig on the server itself.  Also, make sure the ``ip-address`` is correct, and that the ``dns-name`` has your own domain name in it.
+For a VirtualBox installation, you can retrieve the MAC ids for your network adapters by expanding "Advanced" for the adapater in VirtualBox, or by executing ifconfig on the server itself.  
+
+For a physical installation, the MAC address of the server is often printed on the sticker attached to the server for the LOM interfaces, or is available from the BIOS screen.  You may also be able to find the MAC address in the hardware inventory BMC/DRAC/ILO, though this may be server-dependent.
+
+Also, make sure the ``ip-address`` is correct, and that the ``dns-name`` has your own domain name in it.
 
 In this example, IP addresses should be assigned as follows::
 

docs/pages/installation-instructions/0057-prepare-for-deployment.rst

@@ -11,7 +11,7 @@ Before you can deploy OpenStack, you will need to configure the site.pp file.  W
 The four parameters shown here represent the following:
 
    * ``-c``:  The absolute or relative path to the ``config.yaml`` file you customized earlier.
-   * ``-t``:  The template file to serve as a basis for ``site.pp``.  Possible templates include ``site_openstack_ha_compact.pp``, ``site_openstack_ha_minimal.pp``, ``site_openstack_ha_full.pp``, ``site_openstack_ha_single.pp``, and ``site_openstack_ha_simple.pp``.
+   * ``-t``:  The template file to serve as a basis for ``site.pp``.  Possible templates include ``site_openstack_ha_compact.pp``, ``site_openstack_ha_minimal.pp``, ``site_openstack_ha_full.pp``, ``site_openstack_single.pp``, and ``site_openstack_simple.pp``.
    * ``-o``:  The output file.  This should always be ``/etc/puppet/manifests/site.pp``.
    * ``-a``:  The orchestration configuration file, to be output for use in the next step.
 

docs/pages/production-considerations/0015-sizing-hardware.rst

@@ -21,7 +21,7 @@ The basic consideration when it comes to CPU is how many GHZ you're going to nee
 * 2 EC2 compute units (2 GHz) average
 * 16 EC2 compute units (16 GHz) max
 
-What does this mean?  Well, to make it possible to provide the maximum CPU, you will need at least 5 cores (16 GHz/2.4 GHz per core) per machine, and at least 84 cores ((100 VMs * 2 GHz per VM)/2.4 GHz per core) in total.
+What does this mean?  Well, to make it possible to provide the maximum CPU, you will need at least 5 cores (16 GHz/(2.4 GHz per core * 1.3 for hyperthreading)) per machine, and at least 84 cores ((100 VMs * 2 GHz per VM)/2.4 GHz per core) in total.
 
 If you were to choose the Intel E5 2650-70 8 core CPU, that means you need 10-11 sockets (84 cores / 8 cores per socket).
 
@@ -91,7 +91,7 @@ IOPS will also be a factor in determining how you decide to handle persistent st
   * 36 TB raw, or 18 TB usable space per 2U frame
   * 3 frames (50 TB / 18 TB per server)
   * 12 slots x 100 IOPS per drive = 1200 Read IOPS, 600 Write IOPS per frame
-  * 3 frames x 1200 IOPS per frame / 100 VMs = 36 Read IOPS, 18 Write IOPS per frame
+  * 3 frames x 1200 IOPS per frame / 100 VMs = 36 Read IOPS, 18 Write IOPS per VM
 
 * 24 drive storage frame using 1TB 7200 RPM 2.5" drives