Fix 4-6 CP merge conflict

[bobfuru]

Bumped into a merge conflict when cherrypicking to 4.6 because of this PR merge: https://github.com/openshift/openshift-docs/pull/26184/files#diff-4af87df61050e4b8fe830bbb6be46aaab303d94d8e0b79e1ede86f612413395dR41-R76
So this is to resolve that issue in the modules/registry-configuring-storage-baremetal.adoc file.

@vikram-redhat @ktania It looks like this might also need to be updated in other related files for 4.6 branch? We have removed references to "NFS" as detailed in #25826.

I'm going to hold off on merging this to 4.6 until ack from @vikram-redhat.

[openshift-docs-preview-bot]

The preview will be available shortly at:

• https://BZ1850510-update-4-6-CP--ocpdocs.netlify.com/

[vikram-redhat]

@bobfuru - did https://github.com/openshift/openshift-docs/pull/25826/files remove it from other files and the Power docs that we added re-added them? I can't find this, but just wanted to be sure.

[bobfuru]

@vikram-redhat Upon further review, it looks like the only place where the Power docs re-added what #25826 removed was in modules/registry-configuring-storage-baremetal.adoc. (We also removed NFS from vSphere image reg, which is what I was referring to with my earlier comment that "it looks like this might also need to be updated in other related files for 4.6 branch". But that obviously doesn't apply to ibm-z.)
This PR should be good to merge because it reapplies the changes I made to master. Sound good?

[bobfuru]

Merging after Sl-ack by @vikram-redhat

[bobfuru]

/cherrypick enterprise-4.6

[openshift-cherrypick-robot]

@bobfuru: base branch (enterprise-4.6) needs to differ from target branch (enterprise-4.6)

Details

In response to this:

/cherrypick enterprise-4.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[bobfuru]

@bobfuru: base branch (enterprise-4.6) needs to differ from target branch (enterprise-4.6)

muscle memory, tried cherrypicking to same branch 😵