Merge pull request #1024 from holser/fix_grammar_issues

Small changes in documentation

Author: openshift-merge-bot[bot]

docs_user/modules/con_adoption-guidelines.adoc

@@ -12,7 +12,7 @@ Review the following guidelines to adequately plan for the adoption and increase
 All commands in the adoption documentation are examples. Do not copy and paste the commands without understanding what the commands do.
 
 * To minimize the risk of an adoption failure, reduce the number of environmental differences between the staging environment and the production sites.
-* If the staging environment is not representative of the production sites, or a staging environment is not available, then you must plan to include contingency time in case the adoption fails.
+* If the staging environment is not representative of the production sites or if a staging environment is not available, you must plan to include contingency time in case the adoption fails.
 * Review your custom {rhos_prev_long} ({OpenStackShort}) service configuration at every major release.
 ** Every major release upgrades through multiple OpenStack releases.
 ** Each major release might deprecate configuration options or change the format of the configuration.

scenarios/README.md

@@ -63,7 +63,7 @@ applicable, optional.
 - `deploy_command`: string with the stack deploy command to run verbatim,
 if defined, it ignores the `vars` and `args` fields, optional.
 - `stack_nodes`: list of groups for the inventory that contains the nodes that
-will be part of the stack, required. This groups must be a subset of the groups
+will be part of the stack, required. These groups must be a subset of the groups
 used as keys in `hostname_groups_map` and `roles_groups_map`.
 - `routes`: list of routes to define in the nodes' os_net_config template.
 List of dictionaries with the fields `ip_netmask`, `next_hop` and `default`.
@@ -99,7 +99,7 @@ for example, to deploy Ceph. Continuing from the example mentioned in the
 previous section, a possible value for this map would be:
 
 ```
-hostname_groups_map:
+roles_groups_map:
   osp-computes: "Compute"
   osp-controllers: "Controller"
 ```
@@ -134,5 +134,5 @@ pre_oc_run:
 
 Since the `source` attribute is not an absolute path, this example assumes that
 the `adoption_deploy_ceph.yml` playbook exists in the ci-framework (it
-introduced alongside the role to consume the scenarios defined here by
+is introduced alongside the role to consume the scenarios defined here by
 [this PR](https://github.com/openstack-k8s-operators/ci-framework/pull/2297)).

tests/roles/ceph_migrate/README.md

@@ -8,9 +8,9 @@ It **does not** migrate OSDs, hence no data movement is involved.
 It assumes that both `source` and `target` nodes are part of the Ceph cluster,
 and the high level procedure does the following:
 
-1. It Loads the information from the existing Ceph cluster (deployed daemons,
+1. It loads the information from the existing Ceph cluster (deployed daemons,
    status of the cluster, hostmap, services, monmap, osdmap)
-2. It Validates the retrieved information (the cluster is healthy and it's in a
+2. It validates the retrieved information (the cluster is healthy and it's in a
    valid state), and fail if one of the defined conditions is not met
 3. It starts performing the migration with the following order:
    - Ceph Monitoring Stack
@@ -108,7 +108,7 @@ An important override that should be provided is the list of `decomm_nodes` and
 `target_nodes`: the first list maps to the second list (via `zip` function) to
 make sure that each source node has a corresponding target node where the daemons
 can be redeployed.
-In the examle above:
+In the example above:
 
 ```
 controller-0  maps to cephstorage-0
@@ -122,7 +122,7 @@ Dependencies
 Great part of the commands executed against an existing Ceph cluster return a
 `json` formatted output.
 To easily process this output, and minimize the amount of tasks required to
-analize the `stdout` of a registered variable, the `community.general.json_query`
+analyze the `stdout` of a registered variable, the `community.general.json_query`
 module has been extensively used, and it has been added in the `requirements.yaml`
 of the project.