Merge pull request openstack-k8s-operators#745 from katarimanojk/adop…

…tion_ceph_prereq_updates

[Doc] correct ceph adoption prerequisites

docs_user/modules/proc_completing-prerequisites-for-migrating-ceph-rbd.adoc

@@ -16,7 +16,7 @@ endif::[]
 * The {Ceph} cluster is healthy, and the `ceph -s` command returns `HEALTH_OK`.
 * Run `os-net-config` on the bare metal node and configure additional networks:
 .. If target nodes are `CephStorage`, ensure that the network is defined in the
-`metalsmith.yaml` for the `CephStorage` nodes:
+bare metal file for the `CephStorage` nodes, for example, `/home/stack/composable_roles/network/baremetal_deployment.yaml`:
 +
 [source,yaml]
 ----
@@ -28,7 +28,7 @@ name: oc0-ceph-0
 - hostname: oc0-ceph-1
 name: oc0-ceph-1
 defaults:
-/networks:
+networks:
 - network: ctlplane
 vif: true
 - network: storage_cloud_0

docs_user/modules/proc_completing-prerequisites-for-migrating-ceph-rgw.adoc

@@ -52,10 +52,10 @@ Full List of Resources:
 2: enp1s0	inet 192.168.24.45/24 brd 192.168.24.255 scope global enp1s0\   	valid_lft forever preferred_lft forever
 2: enp1s0	inet 192.168.24.46/32 brd 192.168.24.255 scope global enp1s0\   	valid_lft forever preferred_lft forever
 7: br-ex	inet 10.0.0.122/24 brd 10.0.0.255 scope global br-ex\   	valid_lft forever preferred_lft forever <1>
-8: vlan70	inet 172.17.5.22/24 brd 172.17.5.255 scope global vlan70\   	valid_lft forever preferred_lft forever <2>
+8: vlan70	inet 172.17.5.22/24 brd 172.17.5.255 scope global vlan70\   	valid_lft forever preferred_lft forever
 8: vlan70	inet 172.17.5.94/32 brd 172.17.5.255 scope global vlan70\   	valid_lft forever preferred_lft forever
 9: vlan50	inet 172.17.2.140/24 brd 172.17.2.255 scope global vlan50\   	valid_lft forever preferred_lft forever
-10: vlan30	inet 172.17.3.73/24 brd 172.17.3.255 scope global vlan30\   	valid_lft forever preferred_lft forever
+10: vlan30	inet 172.17.3.73/24 brd 172.17.3.255 scope global vlan30\   	valid_lft forever preferred_lft forever <2>
 10: vlan30	inet 172.17.3.68/32 brd 172.17.3.255 scope global vlan30\   	valid_lft forever preferred_lft forever
 11: vlan20	inet 172.17.1.88/24 brd 172.17.1.255 scope global vlan20\   	valid_lft forever preferred_lft forever
 12: vlan40	inet 172.17.4.24/24 brd 172.17.4.255 scope global vlan40\   	valid_lft forever preferred_lft forever
@@ -99,10 +99,13 @@ listen ceph_rgw
 7: br-ex	inet 10.0.0.106/24 brd 10.0.0.255 scope global br-ex\   	valid_lft forever preferred_lft forever
 ...
 ----
++
+[NOTE]
+If the target nodes are not managed by director, you cannot use this procedure to configure the network. An administrator must manually configure all the required networks.
 
 . Propagate the HAProxy front-end network to {CephCluster} nodes.
 
-.. Change the NIC template that you use to define the `ceph-storage` network interfaces and add the new config section:
+.. In the NIC template that you use to define the `ceph-storage` network interfaces, add the new config section in the {Ceph} network configuration template file, for example, `/home/stack/composable_roles/network/nic-configs/ceph-storage.j2`:
 +
 [source,yaml]
 ----
@@ -139,13 +142,16 @@ network_config:
   addresses:
   - ip_netmask: {{ external_ip }}/{{ external_cidr }}
   routes: {{ external_host_routes }}
-  members:
+  members: []
   - type: interface
     name: nic3
     primary: true
 ----
 
-.. Add the External Network to the `baremetal.yaml` file that is used by `metalsmith`:
+.. Add the External Network to the bare metal file, for example, `/home/stack/composable_roles/network/baremetal_deployment.yaml` that is used by `metalsmith`:
++
+[NOTE]
+Ensure that 'network_config_update' is enabled for network propagation to the target nodes when `os-net-config` is triggered.
 +
 [source,yaml]
 ----
@@ -163,6 +169,7 @@ network_config:
   profile: ceph-storage
   network_config:
       template: /home/stack/composable_roles/network/nic-configs/ceph-storage.j2
+      network_config_update: true
   networks:
   - network: ctlplane
       vif: true
@@ -177,10 +184,10 @@ network_config:
 (undercloud) [stack@undercloud-0]$
 
 openstack overcloud node provision
-   -o overcloud-baremetal-deployed-0.yaml
-   --stack overcloud
-   --network-config -y
-  $PWD/network/baremetal_deployment.yaml
+   -o overcloud-baremetal-deployed-0.yaml \
+   --stack overcloud \
+   --network-config -y \
+  $PWD/composable_roles/network/baremetal_deployment.yaml
 ----
 
 .. Verify that the new network is configured on the {CephCluster} nodes:

docs_user/modules/proc_creating-a-ceph-nfs-cluster.adoc

@@ -13,6 +13,9 @@ You must deploy this service on the `StorageNFS` isolated network so that you ca
 You can deploy the new clustered NFS service on your existing CephStorage nodes or HCI nodes, or on new hardware that you enrolled in the {Ceph} cluster.
 
 . If you deployed your {Ceph} nodes with {OpenStackPreviousInstaller}, propagate the `StorageNFS` network to the target nodes where the `ceph-nfs` service is deployed.
++
+[NOTE]
+If the target nodes are not managed by director, you cannot use this procedure to configure the network. An administrator must manually configure all the required networks.
 .. Identify the node definition file, `overcloud-baremetal-deploy.yaml`, that is used in the {OpenStackShort} environment.
 ifeval::["{build}" != "upstream"]
 For more information about identifying the `overcloud-baremetal-deploy.yaml` file, see link:{customizing-rhoso}/index#assembly_customizing-overcloud-networks[Customizing overcloud networks] in _{customizing-rhoso-t}_.
@@ -101,9 +104,8 @@ $ ceph orch host label add <hostname> nfs
 $ ceph nfs cluster create cephfs \
     "label:nfs" \
     --ingress \
-    --virtual-ip=<VIP>
+    --virtual-ip=<VIP> \
     --ingress-mode=haproxy-protocol
-}}
 ----
 +
 * Replace `<VIP>` with the VIP for the Ceph NFS service.