Merge pull request #1188 from klgill/additional-minor-fixes

additional minor copy fixes

Author: openshift-merge-bot[bot]

.ansible-lint

@@ -18,4 +18,3 @@ skip_list:
 strict: false
 quiet: false
 verbosity: 2
-parseable: true

docs_user/modules/proc_adopting-the-compute-service.adoc

@@ -42,7 +42,7 @@ To enable the metadata services of a local cell, set the `enabled` property in t
 ----
 $ rm -f celltemplates
 $ for CELL in $(echo $RENAMED_CELLS); do
-  cat >> celltemplates << EOF
+>  cat >> celltemplates << EOF
 >       ${CELL}:
 >         *hasAPIAccess: true*
 >         cellDatabaseAccount: nova-$CELL

docs_user/modules/proc_migrating-databases-to-mariadb-instances.adoc

@@ -220,8 +220,7 @@ for CELL in $(echo $CELLS); do
   . ~/.source_cloud_exported_variables_$CELL
   set -u
 done
-
-$ test -z "$PULL_OPENSTACK_CONFIGURATION_MYSQLCHECK_NOK"  || [ "x$PULL_OPENSTACK_CONFIGURATION_MYSQLCHECK_NOK" = "x " ] && echo "OK" || echo "CHECK FAILED"
+test -z "$PULL_OPENSTACK_CONFIGURATION_MYSQLCHECK_NOK"  || [ "x$PULL_OPENSTACK_CONFIGURATION_MYSQLCHECK_NOK" = "x " ] && echo "OK" || echo "CHECK FAILED"
 ----
 
 . Test the connection to the control plane upcall and cells databases:
@@ -341,19 +340,19 @@ $ echo $dbs | grep -Eq '\bneutron\b' && echo "OK" || echo "CHECK FAILED"
 $ echo "${PULL_OPENSTACK_CONFIGURATION_DATABASES[@]}" | grep -Eq '\bovs_neutron\b' && echo "OK" || echo "CHECK FAILED"
 $ novadb_mapped_cells=$(oc exec openstack-galera-0 -c galera -- mysql -rs -uroot -p"${PODIFIED_DB_ROOT_PASSWORD['super']}" \
 >   nova_api -e 'select uuid,name,transport_url,database_connection,disabled from cell_mappings;')
-$ uuidf='\S{8,}-\S{4,}-\S{4,}-\S{4,}-\S{12,}'
-$ default=$(printf "%s\n" "$PULL_OPENSTACK_CONFIGURATION_NOVADB_MAPPED_CELLS" | sed -rn "s/^($uuidf)\s+default\b.*$/\1/p")
-$ difference=$(diff -ZNua \
+> uuidf='\S{8,}-\S{4,}-\S{4,}-\S{4,}-\S{12,}'
+> default=$(printf "%s\n" "$PULL_OPENSTACK_CONFIGURATION_NOVADB_MAPPED_CELLS" | sed -rn "s/^($uuidf)\s+default\b.*$/\1/p")
+> difference=$(diff -ZNua \
 >   <(printf "%s\n" "$PULL_OPENSTACK_CONFIGURATION_NOVADB_MAPPED_CELLS") \
 >   <(printf "%s\n" "$novadb_mapped_cells")) || true
-$ if [ "$DEFAULT_CELL_NAME" != "default" ]; then
+> if [ "$DEFAULT_CELL_NAME" != "default" ]; then
 >   printf "%s\n" "$difference" | grep -qE "^\-$default\s+default\b" && echo "OK" || echo "CHECK FAILED"
 >   printf "%s\n" "$difference" | grep -qE "^\+$default\s+$DEFAULT_CELL_NAME\b" && echo "OK" || echo "CHECK FAILED"
 >   [ $(grep -E "^[-\+]$uuidf" <<<"$difference" | wc -l) -eq 2 ] && echo "OK" || echo "CHECK FAILED"
 > else
 >   [ "x$difference" = "x" ] && echo "OK" || echo "CHECK FAILED"
 > fi
-$ for CELL in $(echo $RENAMED_CELLS); do
+> for CELL in $(echo $RENAMED_CELLS); do
 >   RCELL=$CELL
 >   [ "$CELL" = "$DEFAULT_CELL_NAME" ] && RCELL=default
 >   set +u