Merge pull request #1135 from klgill/additional-copybutton-fixes

additional copy fixes from downstream

Author: openshift-merge-bot[bot]

docs_user/modules/proc_adopting-compute-services-to-the-data-plane.adoc

@@ -93,35 +93,35 @@ $ RENAMED_CELLS="cell1 cell2 $DEFAULT_CELL_NAME"
 
 $ declare -A COMPUTES_CELL1
 $ export COMPUTES_CELL1=( <2>
-  ["standalone.localdomain"]="192.168.122.100" <3>
-  # <compute1> <4>
-  # <compute2>
-  # <compute3>
-)
+> ["standalone.localdomain"]="192.168.122.100" <3>
+> # <compute1> <4>
+> # <compute2>
+> # <compute3>
+>)
 $ declare -A COMPUTES_CELL2
 $ export COMPUTES_CELL2=(
-  # ...
-)
+> # ...
+>)
 $ declare -A COMPUTES_CELL3
 $ export COMPUTES_CELL3=(
-  # ... <5>
-)
-# ...
+> # ... <5>
+>)
+># ...
 
 $ declare -A COMPUTES_API_CELL1
 $ export COMPUTES_API_CELL1=( <6>
-  ["standalone.localdomain"]="172.17.0.100"
-  # ...
-)
-# ...
+> ["standalone.localdomain"]="172.17.0.100"
+> # ...
+>)
+># ...
 
 $ NODESETS=""
 $ for CELL in $(echo $RENAMED_CELLS); do
-  ref="COMPUTES_$(echo ${CELL}|tr '[:lower:]' '[:upper:]')"
-  eval names=\${!${ref}[@]}
-  [ -z "$names" ] && continue
-  NODESETS="'openstack-${CELL}', $NODESETS" <7>
-done
+> ref="COMPUTES_$(echo ${CELL}|tr '[:lower:]' '[:upper:]')"
+> eval names=\${!${ref}[@]}
+> [ -z "$names" ] && continue
+> NODESETS="'openstack-${CELL}', $NODESETS" <7>
+>done
 $ NODESETS="[${NODESETS%,*}]"
 ----
 +

docs_user/modules/proc_rolling-back-the-control-plane-adoption.adoc

@@ -158,13 +158,13 @@ $ oc patch openstackcontrolplane openstack --type=merge --patch '
 > metadata:
 >   finalizers: []
 > ' || true
-
-while oc get pod | grep rabbitmq-server-0; do
-    sleep 2
-done
-while oc get pod | grep openstack-galera-0; do
-    sleep 2
-done
+>
+>while oc get pod | grep rabbitmq-server-0; do
+>    sleep 2
+>done
+>while oc get pod | grep openstack-galera-0; do
+>    sleep 2
+>done
 
 $ oc delete --ignore-not-found=true --wait=false pod mariadb-copy-data
 $ oc delete --ignore-not-found=true --wait=false pvc mariadb-data

docs_user/modules/proc_updating-the-object-storage-endpoints.adoc

@@ -11,8 +11,11 @@ You must create or update the {object_storage_first_ref} endpoints to configure
 . List the current swift endpoints and service:
 +
 ----
- $ oc rsh openstackclient openstack endpoint list | grep "swift.*object"
- $ oc rsh openstackclient openstack service list | grep "swift.*object"
+$ oc rsh openstackclient openstack endpoint list | grep "swift.*object"
+----
++
+----
+$ oc rsh openstackclient openstack service list | grep "swift.*object"
 ----
 
 . If the service and endpoints do not exist, create the missing swift resources: