Merge pull request #1140 from klgill/implement-qe-feedback

implementing qe feedback

Author: openshift-merge-bot[bot]

docs_user/modules/proc_enabling-high-availability-for-instances.adoc

@@ -74,12 +74,12 @@ metadata:
   namespace: openstack
 spec:
   caBundleSecretName: combined-ca-bundle
-  instanceHaConfigMap: <instanceha-0-config>
+  instanceHaConfigMap:
   fencingSecret: fencing-secret
 EOF
 ----
 +
-* `instanceha-0-config`: Specifies the name of the Instance HA configuration map that you created. Leave blank to have the `infra-operator` automatically create a configuration map. You can then edit the values as needed.
+* `spec.instanceHaConfigMap` defines the name of the YAML file containing the Instance HA configuration map that you created. If you do not create this file, then a YAML file called `instanceha-config` is created automatically when the Instance HA service is installed, providing the default values of the Instance HA service parameters. You can then edit the values as needed.
 
 . Deploy the Instance HA resource:
 +

docs_user/modules/proc_preventing-pacemaker-from-monitoring-compute-nodes.adoc

@@ -21,7 +21,9 @@ $ sudo pcs property set stonith-enabled=false
 $ sudo pcs resource disable <compute_remote_resource>
 ----
 +
-* Replace `<compute_remote_resource>` with the name of the Compute remote resource in your environment.
+where:
+
+`<compute_remote_resource>`:: Specifies the name of the Compute remote resource in your environment.
 
 . Retrieve the name of the Compute stonith resources:
 +
@@ -32,9 +34,16 @@ $ sudo pcs stonith |grep Level |grep fence_compute |awk '{print $4}' |awk -F ','
 . Remove the Compute node `pacemaker_remote` and fencing resources:
 +
 ----
+$ sudo pcs stonith disable stonith-fence_compute-fence-nova
 $ sudo pcs stonith disable <compute_stonith_resource>
 $ sudo pcs stonith delete <compute_stonith_resource>
 $ sudo pcs resource delete <compute_remote_resource>
+$ sudo pcs resource disable compute-unfence-trigger-clone
+$ sudo pcs resource delete compute-unfence-trigger-clone
+$ sudo pcs resource disable nova-evacuate
+$ sudo pcs resource delete nova-evacuate
 ----
 +
-* Replace `<compute_stonith_resource>` with the name of the Compute stonith resource in your environment.
+where:
+
+`<compute_stonith_resource>`:: Specifies the name of the Compute stonith resource in your environment.