OSDOCS Update modules O-Q part 3 (the missed ones)

[mburke5678]

https://issues.redhat.com/browse/OSDOCS-16697

Adding the :_mod-docs-content-type: metadata to modules starting with O - Q that I missed the first time through.

Did not alter the modules starting with the following:

oadp- None
odc- 5 files
op- Multiple files
osd- None
ossm- Multiple files

[ocpdocs-previewbot]

🤖 Wed Oct 29 20:25:41 - Prow CI generated the docs preview:
https://101369--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

[openshift-ci]

@mburke5678: all tests passed!

Full PR test history. Your PR dashboard.

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-sigs/prow repository. I understand the commands that are listed here.

[xenolinux]

LGTM

[xenolinux]

/cherrypick enterprise-4.14

[xenolinux]

/cherrypick enterprise-4.15

[xenolinux]

/cherrypick enterprise-4.16

[xenolinux]

/cherrypick enterprise-4.17

[xenolinux]

/cherrypick enterprise-4.18

[xenolinux]

/cherrypick enterprise-4.19

[xenolinux]

/cherrypick enterprise-4.20

[xenolinux]

/cherrypick enterprise-4.21

[openshift-cherrypick-robot]

@xenolinux: #101369 failed to apply on top of branch "enterprise-4.14":

Applying: OSDOCS Update modules O-Q part 3 (the missed ones)
Using index info to reconstruct a base tree...
M	modules/oauth-server-overview.adoc
M	modules/oauth-token-requests.adoc
M	modules/ocm-addons-tab.adoc
M	modules/ocm-machinepools-tab.adoc
A	modules/olm-channel-schema.adoc
M	modules/olm-cs-health.adoc
M	modules/olm-csv.adoc
M	modules/olm-dependency-resolution-preferences.adoc
A	modules/olm-deprecations-schema.adoc
M	modules/olm-fb-catalogs-guidelines.adoc
M	modules/olm-mirroring-catalog-post.adoc
M	modules/olm-operator-framework.adoc
M	modules/olm-operator-maturity-model.adoc
M	modules/olm-operatorgroups-rbac.adoc
M	modules/openshift-cluster-maximums-major-releases.adoc
M	modules/opm-cli-ref-generate.adoc
M	modules/opm-cli-ref-index.adoc
M	modules/persistent-storage-csi-drivers-supported.adoc
M	modules/persistent-storage-local-metrics.adoc
M	modules/policy-identity-access-management.adoc
M	modules/policy-incident.adoc
M	modules/policy-security-regulation-compliance.adoc
M	modules/policy-shared-responsibility.adoc
M	modules/private-clusters-default.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/private-clusters-default.adoc
Auto-merging modules/policy-shared-responsibility.adoc
Auto-merging modules/policy-security-regulation-compliance.adoc
Auto-merging modules/policy-incident.adoc
Auto-merging modules/policy-identity-access-management.adoc
Auto-merging modules/persistent-storage-local-metrics.adoc
Auto-merging modules/persistent-storage-csi-drivers-supported.adoc
Auto-merging modules/opm-cli-ref-index.adoc
Auto-merging modules/opm-cli-ref-generate.adoc
Auto-merging modules/openshift-cluster-maximums-major-releases.adoc
Auto-merging modules/olm-operatorgroups-rbac.adoc
Auto-merging modules/olm-operator-maturity-model.adoc
Auto-merging modules/olm-operator-framework.adoc
Auto-merging modules/olm-mirroring-catalog-post.adoc
Auto-merging modules/olm-fb-catalogs-guidelines.adoc
CONFLICT (modify/delete): modules/olm-deprecations-schema.adoc deleted in HEAD and modified in OSDOCS Update modules O-Q part 3 (the missed ones). Version OSDOCS Update modules O-Q part 3 (the missed ones) of modules/olm-deprecations-schema.adoc left in tree.
Auto-merging modules/olm-dependency-resolution-preferences.adoc
Auto-merging modules/olm-csv.adoc
Auto-merging modules/olm-cs-health.adoc
CONFLICT (modify/delete): modules/olm-channel-schema.adoc deleted in HEAD and modified in OSDOCS Update modules O-Q part 3 (the missed ones). Version OSDOCS Update modules O-Q part 3 (the missed ones) of modules/olm-channel-schema.adoc left in tree.
Auto-merging modules/ocm-machinepools-tab.adoc
CONFLICT (content): Merge conflict in modules/ocm-machinepools-tab.adoc
Auto-merging modules/ocm-addons-tab.adoc
CONFLICT (content): Merge conflict in modules/ocm-addons-tab.adoc
Auto-merging modules/oauth-token-requests.adoc
Auto-merging modules/oauth-server-overview.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 OSDOCS Update modules O-Q part 3 (the missed ones)

In response to this:

/cherrypick enterprise-4.14

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-sigs/prow repository.

[openshift-cherrypick-robot]

@xenolinux: #101369 failed to apply on top of branch "enterprise-4.15":

Applying: OSDOCS Update modules O-Q part 3 (the missed ones)
Using index info to reconstruct a base tree...
M	modules/oauth-server-overview.adoc
M	modules/oauth-token-requests.adoc
M	modules/ocm-addons-tab.adoc
M	modules/ocm-machinepools-tab.adoc
M	modules/olm-channel-schema.adoc
M	modules/olm-cs-health.adoc
M	modules/olm-csv.adoc
M	modules/olm-dependency-resolution-preferences.adoc
M	modules/olm-deprecations-schema.adoc
M	modules/olm-fb-catalogs-guidelines.adoc
M	modules/olm-mirroring-catalog-post.adoc
M	modules/olm-operator-framework.adoc
M	modules/olm-operator-maturity-model.adoc
M	modules/openshift-cluster-maximums-major-releases.adoc
M	modules/opm-cli-ref-index.adoc
M	modules/persistent-storage-csi-drivers-supported.adoc
M	modules/persistent-storage-local-metrics.adoc
M	modules/policy-identity-access-management.adoc
M	modules/policy-incident.adoc
M	modules/policy-security-regulation-compliance.adoc
M	modules/policy-shared-responsibility.adoc
M	modules/private-clusters-default.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/private-clusters-default.adoc
Auto-merging modules/policy-shared-responsibility.adoc
Auto-merging modules/policy-security-regulation-compliance.adoc
Auto-merging modules/policy-incident.adoc
Auto-merging modules/policy-identity-access-management.adoc
Auto-merging modules/persistent-storage-local-metrics.adoc
Auto-merging modules/persistent-storage-csi-drivers-supported.adoc
Auto-merging modules/opm-cli-ref-index.adoc
Auto-merging modules/openshift-cluster-maximums-major-releases.adoc
Auto-merging modules/olm-operator-maturity-model.adoc
Auto-merging modules/olm-operator-framework.adoc
Auto-merging modules/olm-mirroring-catalog-post.adoc
Auto-merging modules/olm-fb-catalogs-guidelines.adoc
Auto-merging modules/olm-deprecations-schema.adoc
Auto-merging modules/olm-dependency-resolution-preferences.adoc
Auto-merging modules/olm-csv.adoc
Auto-merging modules/olm-cs-health.adoc
Auto-merging modules/olm-channel-schema.adoc
Auto-merging modules/ocm-machinepools-tab.adoc
CONFLICT (content): Merge conflict in modules/ocm-machinepools-tab.adoc
Auto-merging modules/ocm-addons-tab.adoc
CONFLICT (content): Merge conflict in modules/ocm-addons-tab.adoc
Auto-merging modules/oauth-token-requests.adoc
Auto-merging modules/oauth-server-overview.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 OSDOCS Update modules O-Q part 3 (the missed ones)

In response to this:

/cherrypick enterprise-4.15

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-sigs/prow repository.

[openshift-cherrypick-robot]

@xenolinux: #101369 failed to apply on top of branch "enterprise-4.16":

Applying: OSDOCS Update modules O-Q part 3 (the missed ones)
Using index info to reconstruct a base tree...
M	modules/oauth-server-overview.adoc
M	modules/oauth-token-requests.adoc
M	modules/ocm-addons-tab.adoc
M	modules/ocm-machinepools-tab.adoc
M	modules/olm-channel-schema.adoc
M	modules/olm-cs-health.adoc
M	modules/olm-csv.adoc
M	modules/olm-dependency-resolution-preferences.adoc
M	modules/olm-deprecations-schema.adoc
M	modules/olm-fb-catalogs-guidelines.adoc
M	modules/olm-mirroring-catalog-post.adoc
M	modules/olm-operator-framework.adoc
M	modules/olm-operator-maturity-model.adoc
M	modules/openshift-cluster-maximums-major-releases.adoc
M	modules/opm-cli-ref-index.adoc
M	modules/persistent-storage-csi-drivers-supported.adoc
M	modules/persistent-storage-local-metrics.adoc
M	modules/policy-identity-access-management.adoc
M	modules/policy-incident.adoc
M	modules/policy-security-regulation-compliance.adoc
M	modules/policy-shared-responsibility.adoc
M	modules/private-clusters-default.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/private-clusters-default.adoc
Auto-merging modules/policy-shared-responsibility.adoc
Auto-merging modules/policy-security-regulation-compliance.adoc
Auto-merging modules/policy-incident.adoc
Auto-merging modules/policy-identity-access-management.adoc
Auto-merging modules/persistent-storage-local-metrics.adoc
Auto-merging modules/persistent-storage-csi-drivers-supported.adoc
Auto-merging modules/opm-cli-ref-index.adoc
Auto-merging modules/openshift-cluster-maximums-major-releases.adoc
Auto-merging modules/olm-operator-maturity-model.adoc
Auto-merging modules/olm-operator-framework.adoc
Auto-merging modules/olm-mirroring-catalog-post.adoc
Auto-merging modules/olm-fb-catalogs-guidelines.adoc
Auto-merging modules/olm-deprecations-schema.adoc
Auto-merging modules/olm-dependency-resolution-preferences.adoc
Auto-merging modules/olm-csv.adoc
Auto-merging modules/olm-cs-health.adoc
Auto-merging modules/olm-channel-schema.adoc
Auto-merging modules/ocm-machinepools-tab.adoc
CONFLICT (content): Merge conflict in modules/ocm-machinepools-tab.adoc
Auto-merging modules/ocm-addons-tab.adoc
CONFLICT (content): Merge conflict in modules/ocm-addons-tab.adoc
Auto-merging modules/oauth-token-requests.adoc
Auto-merging modules/oauth-server-overview.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 OSDOCS Update modules O-Q part 3 (the missed ones)

In response to this:

/cherrypick enterprise-4.16

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-sigs/prow repository.

[openshift-cherrypick-robot]

@xenolinux: new pull request created: #101400

In response to this:

/cherrypick enterprise-4.17

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-sigs/prow repository.

[openshift-cherrypick-robot]

@xenolinux: new pull request created: #101401

In response to this:

/cherrypick enterprise-4.18

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-sigs/prow repository.

[openshift-cherrypick-robot]

@xenolinux: new pull request created: #101402

In response to this:

/cherrypick enterprise-4.19

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-sigs/prow repository.

[openshift-cherrypick-robot]

@xenolinux: new pull request created: #101403

In response to this:

/cherrypick enterprise-4.20

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-sigs/prow repository.

[openshift-cherrypick-robot]

@xenolinux: new pull request created: #101404

In response to this:

/cherrypick enterprise-4.21

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-sigs/prow repository.

[xenolinux]

@mburke5678 4.14-4.16 Cps failed; need manual ones.