mirror of
https://github.com/openshift/openshift-docs.git
synced 2026-02-05 12:46:18 +01:00
Fixing merge errors.
This commit is contained in:
AedinC
committed by
openshift-cherrypick-robot
openshift-cherrypick-robot
parent
418c3fc921
commit
fab77ba803
@@ -1,7 +1,7 @@
|
||||
:_mod-docs-content-type: ASSEMBLY
|
||||
include::_attributes/attributes-openshift-dedicated.adoc[]
|
||||
[id="rosa-troubleshooting-cluster-deployments"]
|
||||
= Troubleshooting cluster deployments
|
||||
= Troubleshooting {product-title} cluster deployments
|
||||
:context: rosa-troubleshooting-cluster-deployments
|
||||
|
||||
toc::[]
|
||||
@@ -10,6 +10,8 @@ This document describes how to troubleshoot cluster deployment errors.
|
||||
|
||||
include::modules/rosa-troubleshooting-general-deployment.adoc[leveloffset=+1]
|
||||
include::modules/rosa-troubleshooting-osdccsadmin-deployment.adoc[leveloffset=+1]
|
||||
|
||||
ifdef::openshift-rosa[]
|
||||
include::modules/rosa-troubleshooting-awsnatgatewaylimitexceeded-failure-deployment.adoc[leveloffset=+1]
|
||||
include::modules/rosa-troubleshooting-awsapiratelimitexceeded-failure-deployment.adoc[leveloffset=+1]
|
||||
include::modules/rosa-troubleshooting-s3bucketslimitexceeded-failure-deployment.adoc[leveloffset=+1]
|
||||
@@ -18,38 +20,30 @@ include::modules/rosa-troubleshooting-awsinsufficientcapacity-failure-deployment
|
||||
include::modules/rosa-troubleshooting-toomanyroute53zones-failure-deployment.adoc[leveloffset=+1]
|
||||
include::modules/rosa-troubleshooting-awssubnetnotexist-failure-deployment.adoc[leveloffset=+1]
|
||||
|
||||
// Remove conditional once HCP split happens. Conditional was added due to build break.
|
||||
ifndef::openshift-rosa-hcp[]
|
||||
[role="_additional-resources"]
|
||||
.Additional resources
|
||||
* xref:../../rosa_install_access_delete_clusters/rosa_getting_started_iam/rosa-aws-prereqs.adoc#rosa-vpc_prerequisites[AWS prerequisites for ROSA]
|
||||
endif::openshift-rosa-hcp[]
|
||||
* xref:../../rosa_install_access_delete_clusters/rosa_getting_started_iam/rosa-aws-prereqs.adoc#rosa-vpc_prerequisites[AWS prerequisites for {product-title}]
|
||||
|
||||
include::modules/rosa-troubleshooting-invalidkmskey-failure-deployment.adoc[leveloffset=+1]
|
||||
include::modules/rosa-troubleshooting-multipleroute53zonesfound-failure-deployment.adoc[leveloffset=+1]
|
||||
include::modules/rosa-troubleshooting-invalidinstallconfigsubnet-failure-deployment.adoc[leveloffset=+1]
|
||||
|
||||
// Remove conditional once HCP split happens. Conditional was added due to build break.
|
||||
ifndef::openshift-rosa-hcp[]
|
||||
[role="_additional-resources"]
|
||||
.Additional resources
|
||||
* xref:../../networking/networking_overview/cidr-range-definitions.adoc#cidr-range-definitions[CIDR range definitions]
|
||||
endif::openshift-rosa-hcp[]
|
||||
|
||||
|
||||
include::modules/rosa-troubleshooting-awsinsufficientpermission-failure-deployment.adoc[leveloffset=+1]
|
||||
// Remove conditional once HCP split happens. Conditional was added due to build break.
|
||||
ifndef::openshift-rosa-hcp[]
|
||||
|
||||
[role="_additional-resources"]
|
||||
.Additional resources
|
||||
* xref:../../rosa_planning/rosa-classic-aws-prereqs.adoc#rosa-classic-aws-prereqs[Detailed requirements for deploying ROSA (classic architecture) using STS]
|
||||
// This link needs to remain hidden until the HCP migration is completed
|
||||
// * xref:../../rosa_planning/rosa-sts-aws-prereqs.adoc#rosa-sts-aws-prereqs[Detailed requirements for deploying ROSA (classic architecture) using STS]
|
||||
* xref:../../rosa_install_access_delete_clusters/rosa_getting_started_iam/rosa-aws-prereqs.adoc#rosa-aws-prereqs[AWS prerequisites for ROSA]
|
||||
endif::openshift-rosa-hcp[]
|
||||
* xref:../../rosa_planning/rosa-classic-aws-prereqs.adoc#rosa-classic-aws-prereqs
|
||||
* xref:../../rosa_install_access_delete_clusters/rosa_getting_started_iam/rosa-aws-prereqs.adoc#rosa-aws-prereqs[AWS prerequisites for {product-title}]
|
||||
|
||||
include::modules/rosa-troubleshooting-deleteiamrole-deployment.adoc[leveloffset=+1]
|
||||
include::modules/rosa-troubleshooting-awsec2quotaexceeded-failure-deployment.adoc[leveloffset=+1]
|
||||
include::modules/rosa-troubleshooting-pendingverification-failure-deployment.adoc[leveloffset=+1]
|
||||
include::modules/rosa-troubleshooting-lblimitexceeded-failure-deployment.adoc[leveloffset=+1]
|
||||
endif::openshift-rosa[]
|
||||
include::modules/rosa-troubleshooting-elb-service-role.adoc[leveloffset=+1]
|
||||
include::modules/rosa-troubleshooting-cluster-deletion.adoc[leveloffset=+1]
|
||||
|
||||
@@ -1,52 +1,42 @@
|
||||
:_mod-docs-content-type: ASSEMBLY
|
||||
include::_attributes/attributes-openshift-dedicated.adoc[]
|
||||
[id="rosa-troubleshooting-installations-hcp"]
|
||||
= Troubleshooting {hcp-title} cluster installations
|
||||
= Troubleshooting {product-title} cluster installations
|
||||
:context: rosa-troubleshooting-installations-hcp
|
||||
//Remove this adoc from rosa-classic docs and add xrefs back in once HCP migration occurs.
|
||||
toc::[]
|
||||
|
||||
For help with the installation of {hcp-title-first} clusters, refer to the following sections.
|
||||
For help with the installation of {product-title} clusters, see the following sections.
|
||||
|
||||
include::modules/rosa-troubleshooting-installing.adoc[leveloffset=+1]
|
||||
|
||||
include::modules/rosa-verify-hcp-install.adoc[leveloffset=+1]
|
||||
|
||||
//remove these conditionals once HCP migration happens
|
||||
ifndef::openshift-rosa-hcp[]
|
||||
[role="_additional-resources"]
|
||||
.Additional resources
|
||||
* For information about the prerequisites for installing {hcp-title} clusters, see xref:../../rosa_planning/rosa-hcp-aws-prereqs.adoc#rosa-hcp-aws-prereqs[AWS prerequisites for ROSA with STS].
|
||||
// This link must remain hidden until the HCP migration is completed
|
||||
// * For information about the prerequisites for installing {hcp-title} clusters, see xref:../../rosa_planning/rosa-sts-aws-prereqs.adoc#rosa-sts-aws-prereqs[AWS prerequisites for ROSA with STS].
|
||||
endif::openshift-rosa-hcp[]
|
||||
* For information about the prerequisites for installing {product-title} clusters, see xref:../../rosa_planning/rosa-hcp-aws-prereqs.adoc#rosa-hcp-aws-prereqs[Detailed requirements for deploying {product-title}].
|
||||
|
||||
include::modules/rosa-troubleshoot-hcp-install.adoc[leveloffset=+1]
|
||||
|
||||
//remove these conditionals once HCP migration happens
|
||||
|
||||
// [role="_additional-resources"]
|
||||
// .Additional resources
|
||||
[role="_additional-resources"]
|
||||
.Additional resources
|
||||
// * For information about the required IAM, see xref:../../rosa_planning/rosa-sts-ocm-role.adoc#rosa-sts-ocm-role[ROSA IAM role resources].
|
||||
// ifndef::openshift-rosa-hcp[]
|
||||
// * For information about the AWS STS prerequisites for {hcp-title} clusters, see xref:../../welcome/cloud-experts-rosa-hcp-sts-explained.adoc#cloud-experts-rosa-hcp-sts-explained[AWS STS and ROSA with HCP explained].
|
||||
// endif::openshift-rosa-hcp[]
|
||||
* For information about the AWS STS prerequisites for {product-title} clusters, see xref:../../rosa_architecture/cloud-experts-rosa-hcp-sts-explained.adoc#cloud-experts-rosa-hcp-sts-explained[AWS STS and {product-title} explained].
|
||||
|
||||
include::modules/rosa-hcp-no-console-access.adoc[leveloffset=+1]
|
||||
|
||||
[role="_additional-resources"]
|
||||
.Additional resources
|
||||
ifndef::openshift-rosa-hcp[]
|
||||
* For more information about the {product-title} OAuth server, see xref:../../authentication/understanding-authentication.adoc#oauth-server-overview[ROSA OAuth server].
|
||||
* For more information about the {product-title} ingress operator, xref:../../networking/networking_operators/ingress-operator.adoc#configuring-ingress-controller[Configuring the Ingress Controller].
|
||||
endif::openshift-rosa-hcp[]
|
||||
* For more information about the {product-title} OAuth server, see xref:../../authentication/understanding-authentication.adoc#oauth-server-overview[{product-title} OAuth server].
|
||||
//Commented out until Networking book has been fully migrated.
|
||||
//* For more information about the {product-title} ingress operator, xref:../../networking/networking_operators/ingress-operator.adoc#configuring-ingress-controller[Configuring the Ingress Controller].
|
||||
* For more information about the web console, see xref:../../web_console/web-console-overview.adoc#web-console-overview[Web Console Overview].
|
||||
|
||||
include::modules/rosa-hcp-ready-no-console-access.adoc[leveloffset=+1]
|
||||
|
||||
ifndef::openshift-rosa-hcp[]
|
||||
|
||||
[role="_additional-resources"]
|
||||
.Additional resources
|
||||
* For more information about the `rosa describe machinepool` command, see xref:../../cli_reference/rosa_cli/rosa-manage-objects-cli.adoc#rosa-list-objects[List and describe objects].
|
||||
endif::openshift-rosa-hcp[]
|
||||
|
||||
include::modules/rosa-hcp-private-ready-no-console-access.adoc[leveloffset=+1]
|
||||
|
||||
|
||||
@@ -7,3 +7,7 @@ include::_attributes/attributes-openshift-dedicated.adoc[]
|
||||
toc::[]
|
||||
|
||||
include::modules/rosa-troubleshooting-installing.adoc[leveloffset=+1]
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user