minor fixes for README.adoc

Author: Gan Huang

README.adoc

@@ -27,14 +27,14 @@ implemented either with http://openvswitch.org/[OpenVSwitch] or https://github.c
 A _bastion server_ is used to control the host and service
 configuration.  It can also run local DNS services as
 needed. The host and service configuration is run using
-http://kubernetes.io/[Ansible] playbooks executed from the bastion host.
+https://www.ansible.com/[Ansible] playbooks executed from the bastion host.
 
 _Bastion server_, _master nodes_ and _infra nodes_ is also given a _floating IP_
 address on the public network. This provides direct access to the
 _bastion server_ from where you can access all nodes by SSH.
 _Master nodes_ and _infra nodes_ have _floating IP_ assigned to make sure
 these nodes are accessible when an _external loadbalancer_ is used for
-accessing Openshift services.
+accessing OpenShift services.
 
 All of the OpenShift hosts (master, infra and node) have block storage for
 Docker images and containers provided by Cinder.  OpenShift will run a
@@ -47,15 +47,15 @@ title="OpenShift Architecture"]
 
 == Prerequisites
 
-. OpenStack version Juno or later with the Heat, Neutron, Ceilometer services
+. OpenStack version Juno or later with the Heat, Neutron, Ceilometer, Aodh (Mitaka or later) services
 running:
   * heat-api-cfn service - used for passing heat metadata to nova instances
-  * neutron LBaaS service (optional) - used for loadbalancing requests in HA
+  * Neutron LBaaS service (optional) - used for loadbalancing requests in HA
     mode, if this service is not available, you can deploy dedicated
-    loadbalancer node, see 'Select Loadbalancer Type' section
-  * ceilometer services (optional) - used when autoscaling is enabled
+    loadbalancer node, see <<LoadBalancing>>
+  * Ceilometer services (optional) - used when autoscaling is enabled
 . `ServerGroupAntiAffinityFilter` enabled in Nova service
-  (optionally `ServerGroupAffinityFilter` when using all-in-one Openstack
+  (optionally `ServerGroupAffinityFilter` when using all-in-one OpenStack
   environment)
 . http://www.centos.org/[CentOS] 7.2 cloud image (we leverage cloud-init)
 loaded in Glance for OpenShift Origin Deployments.
@@ -104,8 +104,8 @@ yum -y install openstack-packstack libvirt git
 mv /var/lib/libvirt/images /home
 ln -s /home/images /var/lib/libvirt/images
 
-# Install openstack demonstrator with no real security
-#   This produces the keystonrc_admin file used below
+# Install OpenStack demonstrator with no real security
+#   This produces the keystonerc_admin file used below
 packstack --allinone --provision-all-in-one-ovs-bridge=y \
   --os-heat-install=y --os-heat-cfn-install=y \
   --os-neutron-lbaas-install=y \
@@ -142,7 +142,7 @@ Assuming your external network is called ``public``, your SSH key is ``default``
 ```yaml
 cat << EOF > openshift_parameters.yaml
 parameters:
-   # Use OpenShift Origin (vs Openshift Enterprise)
+   # Use OpenShift Origin (vs OpenShift Enterprise)
    deployment_type: origin
 
    # set SSH access to VMs
@@ -270,19 +270,19 @@ ports 80 and 443 across both nodes.
 == Select Loadbalancer Type
 
 When deploying multiple master nodes, both access to the nodes and OpenShift
-router pods (which run on master nodes) have to be loadbalanced.
-Openshift-on-openstack provides multiple options for setting up loadbalancing:
+router pods (which run on infra nodes) have to be loadbalanced.
+openshift-on-openstack provides multiple options for setting up loadbalancing:
 
 * Neutron LBaaS - this loadbalancer is used by default. Neutron loadbalancer
   serviceis used for loadbalancing console/api requests to master nodes. At the
-  moment Openshift router requests are not loadbalanced and an external
+  moment OpenShift router requests are not loadbalanced and an external
   loadbalancer has to be used for it.
   This is default option, but can be set
   explicitly by including `-e openshift-on-openstack/env_loadbalancer_neutron.yaml`
   when creating the stack. By default, this mode uses <<IPFailover,IP failover>>.
 
 * External loadbalancer - a user is expected to set its own loadbalancer both
-  for master nodes and Openshift routers.
+  for master nodes and OpenShift routers.
   This is suggested type for production.
   To select this type include `-e openshift-on-openstack/env_loadbalancer_external.yaml`
   when creating the stack.
@@ -295,15 +295,15 @@ Openshift-on-openstack provides multiple options for setting up loadbalancing:
   node.
 
 * None - if only single master node is deployed, it's possible to skip
-  loadbalancer creation, then all master node requests and Openshift router requests
+  loadbalancer creation, then all master node requests and OpenShift router requests
   point to the single master node.
   To select this type include `-e openshift-on-openstack/env_loadbalancer_none.yaml`
   when creating the stack. By default, this mode uses <<IPFailover,IP failover>>.
 
 == Select SDN Type ==
 
 By default, OpenShift is deployed with https://docs.openshift.com/enterprise/3.2/architecture/additional_concepts/sdn.html[OpenShift-SDN].
-When used with Openstack Neutron with GRE or VXLAN tunnels, packets are encapsulated twice
+When used with OpenStack Neutron with GRE or VXLAN tunnels, packets are encapsulated twice
 which can have an impact on performances. Those Heat templates allow using https://github.com/coreos/flannel[Flannel]
 instead of openshift-sdn, with the `host-gw` backend to avoid the double encapsulation.
 To do so, you need to include the `env_flannel.yaml` environment file when you create the stack:
@@ -380,7 +380,7 @@ heat stack-create my-openshift \
 When deploying OpenShift registry (`-P deploy_registry=true`) you can use either
 an ephemeral or persistent Cinder volume. Ephemeral volume is used by default,
 the volume is automatically created when creating the stack and is also
-deleted when deleting the stack. Alternatively you can use an existing cinder
+deleted when deleting the stack. Alternatively you can use an existing Cinder
 volume by including the `env_registry_persistent.yaml` environment file and
 `registry_volume_id` when you create the stack:
 
@@ -462,7 +462,7 @@ each node.
 
 == Retrieving the CA certificate
 
-You can retrieve the CA certificate that was generated during the Openshift
+You can retrieve the CA certificate that was generated during the OpenShift
 installation by running
 
 ```bash
@@ -489,7 +489,7 @@ Example:
 == IP failover
 
 These templates allow using IP failover for the OpenShift router. In this mode,
-a virtual IP address is assigned for the Openshift router. Multiple instances of
+a virtual IP address is assigned for the OpenShift router. Multiple instances of
 router may be active but only one instance at a time will have the virtual IP.
 This ensures that minimal downtime in the case of the failure of the current active
 router.
@@ -549,7 +549,7 @@ parameters passed to openshift-ansible by the Heat templates.
 
 == Prebuild images
 
-A `customize-disk-image` script is provided to preinstall Openshift packages.
+A `customize-disk-image` script is provided to preinstall OpenShift packages.
 
 ```bash
 ./customize-disk-image --disk rhel7.2.qcow2 --sm-credentials user:password