Merge pull request #433 from jistr/b/hackathon-tweaks

Fixes for small issues found at the hackathon

docs_dev/assemblies/development_environment.adoc

@@ -156,25 +156,6 @@ make input
 make openstack
 ----
 
-=== Convenience steps
-
-To make our life easier we can copy the deployment passwords we'll be using
-in the https://openstack-k8s-operators.github.io/data-plane-adoption/user/#deploying-backend-services_migrating-databases[backend services deployment phase of the data plane adoption].
-
-[,bash]
-----
-scp -i ~/install_yamls/out/edpm/ansibleee-ssh-key-id_rsa [email protected]:/root/tripleo-standalone-passwords.yaml ~/
-----
-
-If we want to be able to easily run `openstack` commands from the host without
-actually installing the package and copying the configuration file from the VM
-we can create a simple alias:
-
-[,bash]
-----
-alias openstack="ssh -i ~/install_yamls/out/edpm/ansibleee-ssh-key-id_rsa [email protected] OS_CLOUD=standalone openstack"
-----
-
 === Route networks
 
 Route VLAN20 to have access to the MariaDB cluster:
@@ -225,9 +206,15 @@ the install_yamls `*_cleanup` targets. This is further detailed in
 the section:
 https://openstack-k8s-operators.github.io/data-plane-adoption/dev/#_reset_the_environment_to_pre_adoption_state[Reset the environment to pre-adoption state]
 
-=== Create a workload to adopt
+=== Creating a workload to adopt
 
-'''
+To run `openstack` commands from the host without 
+installing the package and copying the configuration file from the virtual machine, create an alias:
+
+[,bash]
+----
+alias openstack="ssh -i ~/install_yamls/out/edpm/ansibleee-ssh-key-id_rsa [email protected] OS_CLOUD=standalone openstack"
+----
 
 ==== Ironic Steps
 
@@ -330,15 +317,25 @@ Create a Barbican secret
 openstack secret store --name testSecret --payload 'TestPayload'
 ```
 
-== Performing the Data Plane Adoption
+== Performing the adoption procedure
+
+To simplify the adoption procedure, copy the deployment passwords that
+you use in copy the deployment passwords that you use in the
+https://openstack-k8s-operators.github.io/data-plane-adoption/user/#deploying-backend-services_migrating-databases[backend
+services deployment phase of the data plane adoption].
+
+[,bash]
+----
+scp -i ~/install_yamls/out/edpm/ansibleee-ssh-key-id_rsa [email protected]:/root/tripleo-standalone-passwords.yaml ~/
+----
 
 The development environment is now set up, you can go to the https://openstack-k8s-operators.github.io/data-plane-adoption/[Adoption
 documentation]
 and perform adoption manually, or run the https://openstack-k8s-operators.github.io/data-plane-adoption/dev/#_test_suite_information[test
 suite]
 against your environment.
 
-== Reset the environment to pre-adoption state
+== Resetting the environment to pre-adoption state
 
 The development environment must be rolled back in case we want to execute another Adoption run.
 

docs_user/assemblies/assembly_storage-requirements.adoc

@@ -5,7 +5,7 @@
 = Storage requirements
 
 When looking into the storage in an OpenStack deployment you can differentiate
-2 different kinds, the storage requirements of the services themselves and the
+two kinds, the storage requirements of the services themselves and the
 storage used for the OpenStack users that the services will manage.
 
 These requirements may drive your OpenShift node selection, as mentioned above,

docs_user/modules/con_about-machine-configs.adoc

@@ -45,5 +45,5 @@ metadata:
 
 Refer to the link:https://docs.openshift.com/container-platform/4.15/post_installation_configuration/machine-configuration-tasks.html[Postinstallation machine configuration tasks] in _OpenShift Container Platform 4.15 Documentation_.
 
-*WARNING:* Applying a `MachineConfig` to an OpenShift node will make the node
-reboot.
+[WARNING]
+Applying a `MachineConfig` to an {OpenShift} node makes the node reboot.

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

@@ -36,12 +36,13 @@ CHARACTER_SET=utf8
 COLLATION=utf8_general_ci
 
 ifeval::["{build}" != "downstream"]
+STORAGE_CLASS=crc-csi-hostpath-provisioner
 MARIADB_IMAGE=quay.io/podified-antelope-centos9/openstack-mariadb:current-podified
 endif::[]
 ifeval::["{build}" == "downstream"]
+STORAGE_CLASS=local-storage
 MARIADB_IMAGE=registry.redhat.io/rhosp-dev-preview/openstack-mariadb-rhel9:18.0
 endif::[]
-STORAGE_CLASS=crc-csi-hostpath-provisioner
 # Replace with your environment's MariaDB Galera cluster VIP and backend IPs:
 SOURCE_MARIADB_IP=192.168.122.99
 declare -A SOURCE_GALERA_MEMBERS

docs_user/modules/proc_migrating-ovn-data.adoc

@@ -21,11 +21,12 @@ defined. Specifically, `openstack/internalapi` network is defined.
 * Define the following shell variables. The values that are used are examples. Replace these example values with values that are correct for your environment:
 +
 ----
-STORAGE_CLASS_NAME=crc-csi-hostpath-provisioner
 ifeval::["{build}" != "downstream"]
+STORAGE_CLASS_NAME=crc-csi-hostpath-provisioner
 OVSDB_IMAGE=quay.io/podified-antelope-centos9/openstack-ovn-base:current-podified
 endif::[]
 ifeval::["{build}" == "downstream"]
+STORAGE_CLASS=local-storage
 OVSDB_IMAGE=registry.redhat.io/rhosp-dev-preview/openstack-ovn-base-rhel9:18.0
 endif::[]
 SOURCE_OVSDB_IP=172.17.1.49