diff --git a/installing/installing_aws/installing-aws-account.adoc b/installing/installing_aws/installing-aws-account.adoc index d15d0c0204..514b8c0742 100644 --- a/installing/installing_aws/installing-aws-account.adoc +++ b/installing/installing_aws/installing-aws-account.adoc @@ -20,7 +20,8 @@ include::modules/installation-aws-regions.adoc[leveloffset=+1] .Next steps -* Install an {product-title} cluster. You can -xref:../../installing/installing_aws/installing-aws-customizations.adoc#installing-aws-customizations[install a customized cluster] -or xref:../../installing/installing_aws/installing-aws-default.adoc#installing-aws-default[quickly install a cluster] -with default options. +* Install an {product-title} cluster: +** xref:../../installing/installing_aws/installing-aws-default.adoc#installing-aws-default[Quickly install a cluster] with default options +** xref:../../installing/installing_aws/installing-aws-customizations.adoc#installing-aws-customizations[Install a cluster with cloud customizations] +** xref:../../installing/installing_aws/installing-aws-network-customizations.adoc#installing-aws-network-customizations[Install a cluster with network customizations] +** xref:../../installing/installing_aws_user_infra/installing-aws-user-infra.adoc#installing-aws-user-infra[Install a cluster on infrastructure that you provision] diff --git a/installing/installing_aws/installing-aws-customizations.adoc b/installing/installing_aws/installing-aws-customizations.adoc index 2850984e92..9e15934e5e 100644 --- a/installing/installing_aws/installing-aws-customizations.adoc +++ b/installing/installing_aws/installing-aws-customizations.adoc @@ -50,7 +50,7 @@ include::modules/installation-launching-installer.adoc[leveloffset=+1] include::modules/installing-aws-customizations.adoc[leveloffset=+1] -include::modules/cli-install.adoc[leveloffset=+1] +include::modules/cli-installing-cli.adoc[leveloffset=+1] include::modules/cli-logging-in-kubeadmin.adoc[leveloffset=+1] diff --git a/installing/installing_aws/installing-aws-default.adoc b/installing/installing_aws/installing-aws-default.adoc index d6e1cbd1a9..d7eba68d19 100644 --- a/installing/installing_aws/installing-aws-default.adoc +++ b/installing/installing_aws/installing-aws-default.adoc @@ -38,7 +38,7 @@ include::modules/installation-obtaining-installer.adoc[leveloffset=+1] include::modules/installation-launching-installer.adoc[leveloffset=+1] -include::modules/cli-install.adoc[leveloffset=+1] +include::modules/cli-installing-cli.adoc[leveloffset=+1] include::modules/cli-logging-in-kubeadmin.adoc[leveloffset=+1] diff --git a/installing/installing_aws/installing-aws-network-customizations.adoc b/installing/installing_aws/installing-aws-network-customizations.adoc index a2a4d6e7dd..e8ab595939 100644 --- a/installing/installing_aws/installing-aws-network-customizations.adoc +++ b/installing/installing_aws/installing-aws-network-customizations.adoc @@ -62,7 +62,7 @@ include::modules/nw-operator-cr.adoc[leveloffset=+1] include::modules/installation-launching-installer.adoc[leveloffset=+1] -include::modules/cli-install.adoc[leveloffset=+1] +include::modules/cli-installing-cli.adoc[leveloffset=+1] include::modules/cli-logging-in-kubeadmin.adoc[leveloffset=+1] diff --git a/installing/installing_aws_user_infra/installing-aws-user-infra.adoc b/installing/installing_aws_user_infra/installing-aws-user-infra.adoc index 256daf09f4..20743fbc64 100644 --- a/installing/installing_aws_user_infra/installing-aws-user-infra.adoc +++ b/installing/installing_aws_user_infra/installing-aws-user-infra.adoc @@ -97,7 +97,7 @@ include::modules/installation-creating-aws-worker.adoc[leveloffset=+2] include::modules/installation-cloudformation-worker.adoc[leveloffset=+3] -include::modules/cli-install.adoc[leveloffset=+1] +include::modules/cli-installing-cli.adoc[leveloffset=+1] include::modules/cli-logging-in-kubeadmin.adoc[leveloffset=+1] diff --git a/installing/installing_azure/installing-azure-account.adoc b/installing/installing_azure/installing-azure-account.adoc index e391f04a67..d002baf10c 100644 --- a/installing/installing_azure/installing-azure-account.adoc +++ b/installing/installing_azure/installing-azure-account.adoc @@ -31,10 +31,8 @@ include::modules/installation-azure-regions.adoc[leveloffset=+1] .Next steps -//// -* Install an {product-title} cluster. You can +* Install an {product-title} cluster on Azure. You can xref:../../installing/installing_azure/installing-azure-customizations.adoc#installing-azure-customizations[install a customized cluster] or xref:../../installing/installing_azure/installing-azure-default.adoc#installing-azure-default[quickly install a cluster] with default options. -//// diff --git a/installing/installing_azure/installing-azure-customizations.adoc b/installing/installing_azure/installing-azure-customizations.adoc index 13643465d4..7714bc5a01 100644 --- a/installing/installing_azure/installing-azure-customizations.adoc +++ b/installing/installing_azure/installing-azure-customizations.adoc @@ -15,8 +15,7 @@ some parameters in the `install-config.yaml` file before you install the cluster * Review details about the xref:../../architecture/architecture-installation.adoc#architecture-installation[{product-title} installation and update] processes. -//* xref:../../installing/installing_azure/installing-azure-account.adoc#installing-azure-account[Configure an Azure account] -//to host the cluster. +* xref:../../installing/installing_azure/installing-azure-account.adoc#installing-azure-account[Configure an Azure account] to host the cluster. * If you use a firewall, you must xref:../../installing/install_config/configuring-firewall.adoc#configuring-firewall[configure it to access Red Hat Insights]. @@ -36,7 +35,7 @@ include::modules/installation-configure-proxy.adoc[leveloffset=+2] include::modules/installation-launching-installer.adoc[leveloffset=+1] -include::modules/cli-install.adoc[leveloffset=+1] +include::modules/cli-installing-cli.adoc[leveloffset=+1] include::modules/cli-logging-in-kubeadmin.adoc[leveloffset=+1] diff --git a/installing/installing_azure/installing-azure-default.adoc b/installing/installing_azure/installing-azure-default.adoc index e532223af0..37b1d3b541 100644 --- a/installing/installing_azure/installing-azure-default.adoc +++ b/installing/installing_azure/installing-azure-default.adoc @@ -13,8 +13,7 @@ Microsoft Azure that uses the default configuration options. * Review details about the xref:../../architecture/architecture-installation.adoc#architecture-installation[{product-title} installation and update] processes. -// * xref:../../installing/installing_azure/installing-azure-account.adoc#installing-azure-account[Configure an Azure account] -// to host the cluster. +* xref:../../installing/installing_azure/installing-azure-account.adoc#installing-azure-account[Configure an Azure account] to host the cluster. * If you use a firewall, you must xref:../../installing/install_config/configuring-firewall.adoc#configuring-firewall[configure it to access Red Hat Insights]. @@ -26,7 +25,7 @@ include::modules/installation-obtaining-installer.adoc[leveloffset=+1] include::modules/installation-launching-installer.adoc[leveloffset=+1] -include::modules/cli-install.adoc[leveloffset=+1] +include::modules/cli-installing-cli.adoc[leveloffset=+1] include::modules/cli-logging-in-kubeadmin.adoc[leveloffset=+1] diff --git a/installing/installing_bare_metal/installing-bare-metal.adoc b/installing/installing_bare_metal/installing-bare-metal.adoc index 675524aa5f..cca977c3af 100644 --- a/installing/installing_bare_metal/installing-bare-metal.adoc +++ b/installing/installing_bare_metal/installing-bare-metal.adoc @@ -43,7 +43,7 @@ include::modules/ssh-agent-using.adoc[leveloffset=+1] include::modules/installation-obtaining-installer.adoc[leveloffset=+1] -include::modules/cli-install.adoc[leveloffset=+1] +include::modules/cli-installing-cli.adoc[leveloffset=+1] include::modules/installation-initializing-manual.adoc[leveloffset=+1] diff --git a/installing/installing_gcp/installing-gcp-account.adoc b/installing/installing_gcp/installing-gcp-account.adoc index faa67bf267..276464d499 100644 --- a/installing/installing_gcp/installing-gcp-account.adoc +++ b/installing/installing_gcp/installing-gcp-account.adoc @@ -19,11 +19,9 @@ include::modules/installation-gcp-enabling-api-services.adoc[leveloffset=+1] include::modules/installation-gcp-regions.adoc[leveloffset=+1] -//// .Next steps -* Install an {product-title} cluster. You can +* Install an {product-title} cluster on GCP. You can xref:../../installing/installing_gcp/installing-gcp-customizations.adoc#installing-gcp-customizations[install a customized cluster] or xref:../../installing/installing_gcp/installing-gcp-default.adoc#installing-gcp-default[quickly install a cluster] with default options. -//// diff --git a/installing/installing_gcp/installing-gcp-customizations.adoc b/installing/installing_gcp/installing-gcp-customizations.adoc index 4a04ae7265..43d61c91ca 100644 --- a/installing/installing_gcp/installing-gcp-customizations.adoc +++ b/installing/installing_gcp/installing-gcp-customizations.adoc @@ -15,8 +15,8 @@ some parameters in the `install-config.yaml` file before you install the cluster * Review details about the xref:../../architecture/architecture-installation.adoc#architecture-installation[{product-title} installation and update] processes. -//* xref:../../installing/installing_gcp/installing-gcp-account.adoc#installing-gcp-account[Configure a GCP account] -//to host the cluster. +* xref:../../installing/installing_gcp/installing-gcp-account.adoc#installing-gcp-account[Configure a GCP account] +to host the cluster. * If you use a firewall, you must xref:../../installing/install_config/configuring-firewall.adoc#configuring-firewall[configure it to access Red Hat Insights]. @@ -36,9 +36,7 @@ include::modules/installation-configure-proxy.adoc[leveloffset=+2] include::modules/installation-launching-installer.adoc[leveloffset=+1] -//include::modules/installing-aws-customizations.adoc[leveloffset=+1] - -include::modules/cli-install.adoc[leveloffset=+1] +include::modules/cli-installing-cli.adoc[leveloffset=+1] include::modules/cli-logging-in-kubeadmin.adoc[leveloffset=+1] diff --git a/installing/installing_gcp/installing-gcp-default.adoc b/installing/installing_gcp/installing-gcp-default.adoc index d980490b09..63795b42c2 100644 --- a/installing/installing_gcp/installing-gcp-default.adoc +++ b/installing/installing_gcp/installing-gcp-default.adoc @@ -13,8 +13,8 @@ Google Cloud Platform (GCP) that uses the default configuration options. * Review details about the xref:../../architecture/architecture-installation.adoc#architecture-installation[{product-title} installation and update] processes. -//* xref:../../installing/installing_gcp/installing-gcp-account.adoc#installing-gcp-account[Configure a GCP account] -//to host the cluster. +* xref:../../installing/installing_gcp/installing-gcp-account.adoc#installing-gcp-account[Configure a GCP account] +to host the cluster. * If you use a firewall, you must xref:../../installing/install_config/configuring-firewall.adoc#configuring-firewall[configure it to access Red Hat Insights]. @@ -26,7 +26,7 @@ include::modules/installation-obtaining-installer.adoc[leveloffset=+1] include::modules/installation-launching-installer.adoc[leveloffset=+1] -include::modules/cli-install.adoc[leveloffset=+1] +include::modules/cli-installing-cli.adoc[leveloffset=+1] include::modules/cli-logging-in-kubeadmin.adoc[leveloffset=+1] diff --git a/installing/installing_restricted_networks/installing-disconnected-preparations.adoc b/installing/installing_restricted_networks/installing-disconnected-preparations.adoc deleted file mode 100644 index 37a34ed0e5..0000000000 --- a/installing/installing_restricted_networks/installing-disconnected-preparations.adoc +++ /dev/null @@ -1,19 +0,0 @@ -[id="installing-restricted-networks-preparations"] -= Preparing to install a disconnected cluster -include::modules/common-attributes.adoc[] -:context: installing-restricted-networks-preparations - -toc::[] - -Before you install a cluster on infrastructure that you provision in a -restricted network, you must prepare the environment. - -//include::modules/cluster-entitlements.adoc[leveloffset=+1] - - -.Next steps - -* Install a cluster on infrastructure that you provision, such as -xref:../installing/installing_vsphere/installing-vsphere.adoc#installing-vsphere[VMware vSphere] -or -xref:../installing/installing_bare_metal/installing-bare-metal.adoc#installing-bare-metal[bare metal]. diff --git a/installing/installing_restricted_networks/installing-disconnected.adoc b/installing/installing_restricted_networks/installing-disconnected.adoc deleted file mode 100644 index 03ca7222aa..0000000000 --- a/installing/installing_restricted_networks/installing-disconnected.adoc +++ /dev/null @@ -1,48 +0,0 @@ -[id="installing-azure-customizations"] -= Installing a cluster on Azure with customizations -include::modules/common-attributes.adoc[] -:context: installing-azure-customizations - -toc::[] - -In {product-title} version {product-version}, you can install a customized -cluster on infrastructure that the installation program provisions on -Microsoft Azure. To customize the installation, you modify -some parameters in the `install-config.yaml` file before you install the cluster. - -.Prerequisites - -* Review details about the -xref:../../architecture/architecture-installation.adoc#architecture-installation[{product-title} installation and update] -processes. -//* xref:../../installing/installing_azure/installing-azure-account.adoc#installing-azure-account[Configure an Azure account] -//to host the cluster. -* If you use a firewall, you must -xref:../../installing/install_config/configuring-firewall.adoc#configuring-firewall[configure it to access Red Hat Insights]. - -include::modules/cluster-entitlements.adoc[leveloffset=+1] - -include::modules/ssh-agent-using.adoc[leveloffset=+1] - -include::modules/installation-obtaining-installer.adoc[leveloffset=+1] - -include::modules/installation-initializing.adoc[leveloffset=+1] - -include::modules/installation-configuration-parameters.adoc[leveloffset=+2] - -include::modules/installation-azure-config-yaml.adoc[leveloffset=+2] - -// TODO: If this assembly is going to be for restricted network Azure install, whenever it is included, need to confirm whether proxy is supported before including the following file: -// include::modules/installation-configure-proxy.adoc[leveloffset=+2] - -include::modules/installation-launching-installer.adoc[leveloffset=+1] - -include::modules/cli-install.adoc[leveloffset=+1] - -include::modules/cli-logging-in-kubeadmin.adoc[leveloffset=+1] - -.Next steps - -* xref:../../installing/install_config/customizations.adoc#customizations[Customize your cluster]. -* If necessary, you can -xref:../../telemetry/opting-out-of-telemetry.adoc#opting-out-of-telemetry[opt out of telemetry]. diff --git a/installing/installing_restricted_networks/installing-restricted-networks-aws.adoc b/installing/installing_restricted_networks/installing-restricted-networks-aws.adoc index 46f7f2e712..7c9b7a524d 100644 --- a/installing/installing_restricted_networks/installing-restricted-networks-aws.adoc +++ b/installing/installing_restricted_networks/installing-restricted-networks-aws.adoc @@ -22,14 +22,14 @@ according to your company's policies. .Prerequisites -//* xref:../../installing/installing_restricted_networks/installing-restricted-networks-preparations.adoc[Create a mirror registry on your bastion host] -// and obtain the `imageContentSources` data for your version of {product-title}. -//// +* xref:../../installing/installing_restricted_networks/installing-restricted-networks-preparations.adoc#installing-restricted-networks-preparations[Create a mirror registry on your bastion host] + and obtain the `imageContentSources` data for your version of {product-title}. ++ [IMPORTANT] ==== Because the installation media is on the bastion host, use that computer to complete all installation steps. -//// +==== * Review details about the xref:../../architecture/architecture-installation.adoc#architecture-installation[{product-title} installation and update] processes. diff --git a/installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc b/installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc index b2c8723688..cbae7f1423 100644 --- a/installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc +++ b/installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc @@ -19,14 +19,13 @@ before you attempt to install an {product-title} cluster in such an environment. .Prerequisites -//* xref:../../installing/installing_restricted_networks/installing-restricted-networks-preparations.adoc[Create a mirror registry on your bastion host] -// and obtain the `imageContentSources` data for your version of {product-title}. -//// +* xref:../../installing/installing_restricted_networks/installing-restricted-networks-preparations.adoc#installing-restricted-networks-preparations[Create a mirror registry on your bastion host] and obtain the `imageContentSources` data for your version of {product-title}. ++ [IMPORTANT] ==== Because the installation media is on the bastion host, use that computer to complete all installation steps. -//// +==== * Provision xref:../../storage/understanding-persistent-storage.adoc#understanding-persistent-storage[persistent storage] for your cluster. To deploy a private image registry, your storage must provide diff --git a/installing/installing_restricted_networks/installing-restricted-networks-preparations.adoc b/installing/installing_restricted_networks/installing-restricted-networks-preparations.adoc index 0668f1cf90..3ce833e78e 100644 --- a/installing/installing_restricted_networks/installing-restricted-networks-preparations.adoc +++ b/installing/installing_restricted_networks/installing-restricted-networks-preparations.adoc @@ -24,7 +24,7 @@ include::modules/installation-about-mirror-registry.adoc[leveloffset=+1] Before you create the mirror registry, you must prepare the bastion host. -include::modules/cli-install.adoc[leveloffset=+2] +include::modules/cli-installing-cli.adoc[leveloffset=+2] include::modules/installation-creating-mirror-registry.adoc[leveloffset=+1] @@ -34,12 +34,8 @@ include::modules/installation-local-registry-pull-secret.adoc[leveloffset=+1] include::modules/installation-mirror-repository.adoc[leveloffset=+1] -//// -Need to fix these links after the other PR merges. .Next steps -* Install a cluster on infrastructure that you provision, such as -xref:../installing/installing_vsphere/installing-vsphere.adoc#installing-vsphere[VMware vSphere] -or -xref:../installing/installing_bare_metal/installing-bare-metal.adoc#installing-bare-metal[bare metal]. -//// +* Install a cluster on infrastructure that you provision in your restricted nework, such as on +xref:../../installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc#installing-restricted-networks-vsphere[VMware vSphere], +xref:../../installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc#installing-restricted-networks-bare-metal[bare metal], or xref:../../installing/installing_restricted_networks/installing-restricted-networks-aws.adoc#installing-restricted-networks-aws[Amazon Web Services]. diff --git a/installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc b/installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc index c207bc4466..04ee50f710 100644 --- a/installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc +++ b/installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc @@ -10,14 +10,13 @@ VMware vSphere infrastructure that you provision in a restricted network. .Prerequisites -//* xref:../../installing/installing_restricted_networks/installing-restricted-networks-preparations.adoc[Create a mirror registry on your bastion host] -// and obtain the `imageContentSources` data for your version of {product-title}. -//// +* xref:../../installing/installing_restricted_networks/installing-restricted-networks-preparations.adoc#installing-restricted-networks-preparations[Create a mirror registry on your bastion host] and obtain the `imageContentSources` data for your version of {product-title}. ++ [IMPORTANT] ==== Because the installation media is on the bastion host, use that computer to complete all installation steps. -//// +==== * Provision xref:../../storage/understanding-persistent-storage.adoc#understanding-persistent-storage[persistent storage] for your cluster. To deploy a private image registry, your storage must provide diff --git a/installing/installing_vsphere/installing-vsphere.adoc b/installing/installing_vsphere/installing-vsphere.adoc index 19714889ad..57507b3b5e 100644 --- a/installing/installing_vsphere/installing-vsphere.adoc +++ b/installing/installing_vsphere/installing-vsphere.adoc @@ -46,7 +46,7 @@ include::modules/installation-generate-ignition-configs.adoc[leveloffset=+1] include::modules/installation-vsphere-machines.adoc[leveloffset=+1] -include::modules/cli-install.adoc[leveloffset=+1] +include::modules/cli-installing-cli.adoc[leveloffset=+1] include::modules/installation-installing-bare-metal.adoc[leveloffset=+1] diff --git a/modules/cli-install.adoc b/modules/cli-install.adoc deleted file mode 100644 index 4d4b4d3507..0000000000 --- a/modules/cli-install.adoc +++ /dev/null @@ -1,39 +0,0 @@ -// Module included in the following assemblies: -// -// * installing/installing_aws/installing-aws-customizations.adoc -// * installing/installing_aws/installing-aws-default.adoc -// * installing/installing_aws/installing-aws-network-customizations.adoc -// * installing/installing_aws_user_infra/installing-aws-user-infra.adoc -// * installing/installing_azure/installing-azure-customizations.adoc -// * installing/installing_bare_metal/installing-bare-metal.adoc -// * installing/installing_gcp/installing-gcp-default.adoc -// * installing/installing_gcp/installing-gcp-customizations.adoc -// * installing/installing_vsphere/installing-vsphere.adoc - -[id="cli-install_{context}"] -= Installing the OpenShift Command-line Interface - -You can download and install the OpenShift Command-line Interface (CLI), -commonly known as `oc`. - -[IMPORTANT] -==== -If you installed an earlier version of `oc`, you cannot use it to complete all -of the commands in {product-title} {product-version}. You must download and -install the new version of `oc`. -==== - -.Procedure - -. From the link:https://cloud.redhat.com/openshift/install[OpenShift Infrastructure Providers] page, -click *Download Command-line Tools*. - -. From the site that is displayed, download the compressed file for your -operating system. -+ -[NOTE] -==== -You can install `oc` on Linux, Windows, or macOS. -==== - -. Extract the compressed file and place it in a directory that is on your PATH. diff --git a/modules/cli-installing-cli.adoc b/modules/cli-installing-cli.adoc index 231f9188e5..a3af9963eb 100644 --- a/modules/cli-installing-cli.adoc +++ b/modules/cli-installing-cli.adoc @@ -1,6 +1,17 @@ // Module included in the following assemblies: // // * cli_reference/getting-started.adoc +// * installing/installing_aws_user_infra/installing-aws-user-infra.adoc +// * installing/installing_aws/installing-aws-customizations.adoc +// * installing/installing_aws/installing-aws-default.adoc +// * installing/installing_aws/installing-aws-network-customizations.adoc +// * installing/installing_azure/installing-azure-customizations.adoc +// * installing/installing_azure/installing-azure-default.adoc +// * installing/installing_bare_metal/installing-bare-metal.adoc +// * installing/installing_gcp/installing-gcp-customizations.adoc +// * installing/installing_gcp/installing-gcp-default.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-preparations.adoc +// * installing/installing_vsphere/installing-vsphere.adoc // // AMQ docs link to this; do not change anchor @@ -10,12 +21,24 @@ You can install the CLI in order to interact with {product-title} using a command-line interface. +[IMPORTANT] +==== +If you installed an earlier version of `oc`, you cannot use it to complete all +of the commands in {product-title} {product-version}. You must download and +install the new version of `oc`. +==== + .Procedure . From the link:https://cloud.redhat.com/openshift/install[OpenShift Infrastructure Providers] page, click *Download Command-line Tools*. . Click the folder for your operating system and architecture and click the compressed file. ++ +[NOTE] +==== +You can install `oc` on Linux, Windows, or macOS. +==== . Save the file to your file system. . Extract the compressed file. . Place it in a directory that is on your `PATH`. diff --git a/modules/cli-logging-in-kubeadmin.adoc b/modules/cli-logging-in-kubeadmin.adoc index 13b5e5f81c..f8c9abe19a 100644 --- a/modules/cli-logging-in-kubeadmin.adoc +++ b/modules/cli-logging-in-kubeadmin.adoc @@ -1,16 +1,20 @@ // Module included in the following assemblies: // -// * installing/installing_aws/installing-aws-default.adoc -// * installing/installing_aws/installing-aws-customizations.adoc -// * installing/installing_aws/installing-aws-network-customizations.adoc // * installing/installing_aws_user_infra/installing-aws-user-infra.adoc +// * installing/installing_aws/installing-aws-customizations.adoc +// * installing/installing_aws/installing-aws-default.adoc +// * installing/installing_aws/installing-aws-network-customizations.adoc // * installing/installing_azure/installing-azure-customizations.adoc +// * installing/installing_azure/installing-azure-default.adoc // * installing/installing_bare_metal/installing-bare-metal.adoc -// * installing/installing_gcp/installing-gcp-default.adoc // * installing/installing_gcp/installing-gcp-customizations.adoc -// * installing/installing_osp/installing-openstack-installer.adoc +// * installing/installing_gcp/installing-gcp-default.adoc // * installing/installing_openstack/installing-openstack-installer-custom.adoc // * installing/installing_openstack/installing-openstack-installer-kuryr.adoc +// * installing/installing_openstack/installing-openstack-installer.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere.adoc [id="cli-logging-in-kubeadmin_{context}"] diff --git a/modules/cluster-entitlements.adoc b/modules/cluster-entitlements.adoc index f3f94c222c..2cc9d127f4 100644 --- a/modules/cluster-entitlements.adoc +++ b/modules/cluster-entitlements.adoc @@ -1,17 +1,21 @@ // Module included in the following assemblies: // // * architecture/architecture.adoc -// * installing/installing_aws/installing-aws-default.adoc -// * installing/installing_aws/installing-aws-customizations.adoc -// * installing/installing_aws/installing-aws-network-customizations.adoc // * installing/installing_aws_user_infra/installing-aws-user-infra.adoc +// * installing/installing_aws/installing-aws-customizations.adoc +// * installing/installing_aws/installing-aws-default.adoc +// * installing/installing_aws/installing-aws-network-customizations.adoc // * installing/installing_azure/installing-azure-customizations.adoc +// * installing/installing_azure/installing-azure-default.adoc // * installing/installing_bare_metal/installing-bare-metal.adoc -// * installing/installing_gcp/installing-gcp-default.adoc // * installing/installing_gcp/installing-gcp-customizations.adoc -// * installing/installing_openstack/installing-openstack-installer.adoc +// * installing/installing_gcp/installing-gcp-default.adoc // * installing/installing_openstack/installing-openstack-installer-custom.adoc // * installing/installing_openstack/installing-openstack-installer-kuryr.adoc +// * installing/installing_openstack/installing-openstack-installer.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere.adoc [id="cluster-entitlements_{context}"] diff --git a/modules/installation-about-restricted-network.adoc b/modules/installation-about-restricted-network.adoc index f507cf058e..77c1192cb4 100644 --- a/modules/installation-about-restricted-network.adoc +++ b/modules/installation-about-restricted-network.adoc @@ -1,6 +1,8 @@ // Module included in the following assemblies: // -// * installing/installing_restricted_networks/installing-restricted-networks-preparations.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc [id="installation-about-restricted-networks_{context}"] = About installations in restricted networks diff --git a/modules/installation-approve-csrs.adoc b/modules/installation-approve-csrs.adoc index cdc3f8423e..31b031e84d 100644 --- a/modules/installation-approve-csrs.adoc +++ b/modules/installation-approve-csrs.adoc @@ -2,6 +2,9 @@ // // * installing/installing_aws_user_infra/installing-aws-user-infra.adoc // * installing/installing_bare_metal/installing-bare-metal.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere.adoc // * machine_management/adding-rhel-compute.adoc // * machine_management/more-rhel-compute.adoc diff --git a/modules/installation-aws-permissions.adoc b/modules/installation-aws-permissions.adoc index 8a89c93af8..e568ac6142 100644 --- a/modules/installation-aws-permissions.adoc +++ b/modules/installation-aws-permissions.adoc @@ -1,7 +1,8 @@ // Module included in the following assemblies: // -// * installing/installing-aws/installing-aws-account.adoc // * installing/installing_aws_user_infra/installing-aws-user-infra.adoc +// * installing/installing_aws/installing-aws-account.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc [id="installation-aws-permissions_{context}"] = Required AWS permissions diff --git a/modules/installation-aws-user-infra-bootstrap.adoc b/modules/installation-aws-user-infra-bootstrap.adoc index 5f28982b8c..e1700acffb 100644 --- a/modules/installation-aws-user-infra-bootstrap.adoc +++ b/modules/installation-aws-user-infra-bootstrap.adoc @@ -1,6 +1,7 @@ // Module included in the following assemblies: // // * installing/installing_aws_user_infra/installing-aws-user-infra.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc [id="installation-aws-user-infra-bootstrap_{context}"] = Initializing the bootstrap node on AWS with user-provisioned infrastructure diff --git a/modules/installation-aws-user-infra-installation.adoc b/modules/installation-aws-user-infra-installation.adoc index 29630aba9a..0a96de459a 100644 --- a/modules/installation-aws-user-infra-installation.adoc +++ b/modules/installation-aws-user-infra-installation.adoc @@ -1,6 +1,7 @@ // Module included in the following assemblies: // // * installing/installing_aws_user_infra/installing-aws-user-infra.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc [id="installation-aws-user-infra-installation_{context}"] = Completing an AWS installation on user-provisioned infrastructure diff --git a/modules/installation-aws-user-infra-requirements.adoc b/modules/installation-aws-user-infra-requirements.adoc index 2895eac6e4..ef045949ec 100644 --- a/modules/installation-aws-user-infra-requirements.adoc +++ b/modules/installation-aws-user-infra-requirements.adoc @@ -1,6 +1,7 @@ // Module included in the following assemblies: // // * installing/installing_aws_user_infra/installing-aws-user-infra.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc [id="installation-aws-user-infra-requirements_{context}"] = Required AWS infrastructure components diff --git a/modules/installation-aws-user-infra-rhcos-ami.adoc b/modules/installation-aws-user-infra-rhcos-ami.adoc index bd25582e66..7c70509487 100644 --- a/modules/installation-aws-user-infra-rhcos-ami.adoc +++ b/modules/installation-aws-user-infra-rhcos-ami.adoc @@ -1,6 +1,7 @@ // Module included in the following assemblies: // // * installing/installing_aws_user_infra/installing-aws-user-infra.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc [id="installation-aws-user-infra-rhcos-ami_{context}"] = {op-system} AMIs for the AWS infrastructure diff --git a/modules/installation-cloudformation-bootstrap.adoc b/modules/installation-cloudformation-bootstrap.adoc index 072e03b9ce..c3e4a1d8d7 100644 --- a/modules/installation-cloudformation-bootstrap.adoc +++ b/modules/installation-cloudformation-bootstrap.adoc @@ -1,6 +1,7 @@ // Module included in the following assemblies: // // * installing/installing_aws_user_infra/installing-aws-user-infra.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc [id="installation-cloudformation-bootstrap_{context}"] = CloudFormation template for the bootstrap machine diff --git a/modules/installation-cloudformation-control-plane.adoc b/modules/installation-cloudformation-control-plane.adoc index 62646e65fd..7c05546e7f 100644 --- a/modules/installation-cloudformation-control-plane.adoc +++ b/modules/installation-cloudformation-control-plane.adoc @@ -1,6 +1,7 @@ // Module included in the following assemblies: // // * installing/installing_aws_user_infra/installing-aws-user-infra.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc [id="installation-cloudformation-control-plane_{context}"] = CloudFormation template for control plane machines diff --git a/modules/installation-cloudformation-dns.adoc b/modules/installation-cloudformation-dns.adoc index 09293c503f..3f8c658b66 100644 --- a/modules/installation-cloudformation-dns.adoc +++ b/modules/installation-cloudformation-dns.adoc @@ -1,6 +1,7 @@ // Module included in the following assemblies: // // * installing/installing_aws_user_infra/installing-aws-user-infra.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc [id="installation-cloudformation-dns_{context}"] = CloudFormation template for the network and load balancers diff --git a/modules/installation-cloudformation-security.adoc b/modules/installation-cloudformation-security.adoc index 712f484b1c..b195e3919a 100644 --- a/modules/installation-cloudformation-security.adoc +++ b/modules/installation-cloudformation-security.adoc @@ -1,6 +1,7 @@ // Module included in the following assemblies: // // * installing/installing_aws_user_infra/installing-aws-user-infra.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc [id="installation-cloudformation-security_{context}"] = CloudFormation template for security objects diff --git a/modules/installation-cloudformation-vpc.adoc b/modules/installation-cloudformation-vpc.adoc index ed159c705e..5e7e528752 100644 --- a/modules/installation-cloudformation-vpc.adoc +++ b/modules/installation-cloudformation-vpc.adoc @@ -1,6 +1,7 @@ // Module included in the following assemblies: // // * installing/installing_aws_user_infra/installing-aws-user-infra.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc [id="installation-cloudformation-vpc_{context}"] = CloudFormation template for the VPC diff --git a/modules/installation-cloudformation-worker.adoc b/modules/installation-cloudformation-worker.adoc index a6a3d2440d..3c360268eb 100644 --- a/modules/installation-cloudformation-worker.adoc +++ b/modules/installation-cloudformation-worker.adoc @@ -1,6 +1,7 @@ // Module included in the following assemblies: // // * installing/installing_aws_user_infra/installing-aws-user-infra.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc [id="installation-cloudformation-worker_{context}"] = CloudFormation template for worker machines diff --git a/modules/installation-complete-user-infra.adoc b/modules/installation-complete-user-infra.adoc index 594fb33314..592885c1cc 100644 --- a/modules/installation-complete-user-infra.adoc +++ b/modules/installation-complete-user-infra.adoc @@ -1,6 +1,8 @@ // Module included in the following assemblies: // // * installing/installing_bare_metal/installing-bare-metal.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere.adoc [id="installation-complete-user-infra_{context}"] diff --git a/modules/installation-configuration-parameters.adoc b/modules/installation-configuration-parameters.adoc index 8f6550d448..0d091727a1 100644 --- a/modules/installation-configuration-parameters.adoc +++ b/modules/installation-configuration-parameters.adoc @@ -261,13 +261,14 @@ ifdef::azure[] [cols=".^2,.^3a,.^3a",options="header"] |==== |Parameter|Description|Values + |`machines.platform.azure.type` |The Azure VM instance type. |VMs that use Windows or Linux as the operating system. See the link:https://docs.microsoft.com/en-us/azure-stack/operator/azure-stack-supported-os?view=azs-1908[Guest operating systems supported on Azure Stack] in the Azure documentation. -`machines.platform.azure.osDisk.diskSizeGB` +|`machines.platform.azure.osDisk.diskSizeGB` |The Azure disk size for the VM. |Integer that represents the size of the disk in GB, for example `512`. The minimum supported disk size is `120`. diff --git a/modules/installation-configure-proxy.adoc b/modules/installation-configure-proxy.adoc index 700c98be48..aa976149c6 100644 --- a/modules/installation-configure-proxy.adoc +++ b/modules/installation-configure-proxy.adoc @@ -1,14 +1,14 @@ // Module included in the following assemblies: // -// * installing/installing_aws/installing-aws-customizations.adoc // * installing/installing_aws_user_infra/installing-aws-user-infra.adoc -// * installing/installing_bare_metal/installing-bare-metal.adoc -// * installing/installing_vsphere/installing-vsphere.adoc -// * installing/installing_gcp/installing-gcp-customizations.adoc +// * installing/installing_aws/installing-aws-customizations.adoc // * installing/installing_azure/installing-azure-customizations.adoc +// * installing/installing_bare_metal/installing-bare-metal.adoc +// * installing/installing_gcp/installing-gcp-customizations.adoc // * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc // * installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc // * installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc +// * installing/installing_vsphere/installing-vsphere.adoc ifeval::["{context}" == "installing-bare-metal"] :bare-metal: diff --git a/modules/installation-creating-aws-bootstrap.adoc b/modules/installation-creating-aws-bootstrap.adoc index 699d99707e..66a3759007 100644 --- a/modules/installation-creating-aws-bootstrap.adoc +++ b/modules/installation-creating-aws-bootstrap.adoc @@ -1,6 +1,7 @@ // Module included in the following assemblies: // // * installing/installing_aws_user_infra/installing-aws-user-infra.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc [id="installation-creating-aws-bootstrap_{context}"] = Creating the bootstrap node in AWS diff --git a/modules/installation-creating-aws-control-plane.adoc b/modules/installation-creating-aws-control-plane.adoc index b82136afc7..b074838a39 100644 --- a/modules/installation-creating-aws-control-plane.adoc +++ b/modules/installation-creating-aws-control-plane.adoc @@ -1,6 +1,7 @@ // Module included in the following assemblies: // // * installing/installing_aws_user_infra/installing-aws-user-infra.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc [id="installation-creating-aws-control-plane_{context}"] = Creating the control plane machines in AWS diff --git a/modules/installation-creating-aws-dns.adoc b/modules/installation-creating-aws-dns.adoc index ea372df8d1..1c081ed93d 100644 --- a/modules/installation-creating-aws-dns.adoc +++ b/modules/installation-creating-aws-dns.adoc @@ -1,6 +1,7 @@ // Module included in the following assemblies: // // * installing/installing_aws_user_infra/installing-aws-user-infra.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc [id="installation-creating-aws-dns_{context}"] = Creating networking and load balancing components in AWS diff --git a/modules/installation-creating-aws-security.adoc b/modules/installation-creating-aws-security.adoc index 959fb622ff..910721a39c 100644 --- a/modules/installation-creating-aws-security.adoc +++ b/modules/installation-creating-aws-security.adoc @@ -1,6 +1,7 @@ // Module included in the following assemblies: // // * installing/installing_aws_user_infra/installing-aws-user-infra.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc [id="installation-creating-aws-security_{context}"] = Creating security group and roles in AWS @@ -100,4 +101,4 @@ the other CloudFormation templates that you run to create your cluster: `MasterSecurityGroupId`:: Master Security Group ID `WorkerSecurityGroupId`:: Worker Security Group ID `MasterInstanceProfile`:: Master IAM Instance Profile -`WorkerInstanceProfile`:: Worker IAM Instance Profile \ No newline at end of file +`WorkerInstanceProfile`:: Worker IAM Instance Profile diff --git a/modules/installation-creating-aws-vpc.adoc b/modules/installation-creating-aws-vpc.adoc index 5acc1077bb..bd1eb74284 100644 --- a/modules/installation-creating-aws-vpc.adoc +++ b/modules/installation-creating-aws-vpc.adoc @@ -1,6 +1,7 @@ // Module included in the following assemblies: // // * installing/installing_aws_user_infra/installing-aws-user-infra.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc [id="installation-creating-aws-vpc_{context}"] = Creating a VPC in AWS @@ -87,4 +88,4 @@ the other CloudFormation templates that you run to create your cluster: [horizontal] `VpcId`:: The ID of your VPC. `PublicSubnetIds`:: The IDs of the new public subnets. -`PrivateSubnetIds`:: The IDs of the new private subnets. \ No newline at end of file +`PrivateSubnetIds`:: The IDs of the new private subnets. diff --git a/modules/installation-creating-aws-worker.adoc b/modules/installation-creating-aws-worker.adoc index c669b7802d..dc1a1256d3 100644 --- a/modules/installation-creating-aws-worker.adoc +++ b/modules/installation-creating-aws-worker.adoc @@ -1,6 +1,7 @@ // Module included in the following assemblies: // // * installing/installing_aws_user_infra/installing-aws-user-infra.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc [id="installation-creating-aws-worker_{context}"] = Creating the worker nodes in AWS diff --git a/modules/installation-dns-user-infra.adoc b/modules/installation-dns-user-infra.adoc index 7a4fcf331d..e4b63b50d6 100644 --- a/modules/installation-dns-user-infra.adoc +++ b/modules/installation-dns-user-infra.adoc @@ -1,6 +1,8 @@ // Module included in the following assemblies: // // * installing/installing_bare_metal/installing-bare-metal.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere.adoc :prewrap!: diff --git a/modules/installation-extracting-infraid.adoc b/modules/installation-extracting-infraid.adoc index d06a844d73..7417b0f100 100644 --- a/modules/installation-extracting-infraid.adoc +++ b/modules/installation-extracting-infraid.adoc @@ -1,6 +1,7 @@ // Module included in the following assemblies: // // * installing/installing_aws_user_infra/installing-aws-user-infra.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc [id="installation-extracting-infraid_{context}"] = Extracting the infrastructure name diff --git a/modules/installation-generate-aws-user-infra-ignition.adoc b/modules/installation-generate-aws-user-infra-ignition.adoc index 38583e45d7..718d152628 100644 --- a/modules/installation-generate-aws-user-infra-ignition.adoc +++ b/modules/installation-generate-aws-user-infra-ignition.adoc @@ -1,6 +1,7 @@ // Module included in the following assemblies: // // * installing/installing_aws_user_infra/installing-aws-user-infra.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc [id="installation-generate-aws-user-infra-ignition_{context}"] = Creating the Kubernetes manifest and Ignition config files diff --git a/modules/installation-generate-aws-user-infra-install-config.adoc b/modules/installation-generate-aws-user-infra-install-config.adoc index 71d29eb7b0..05397daa7a 100644 --- a/modules/installation-generate-aws-user-infra-install-config.adoc +++ b/modules/installation-generate-aws-user-infra-install-config.adoc @@ -1,6 +1,7 @@ // Module included in the following assemblies: // // * installing/installing_aws_user_infra/installing-aws-user-infra.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc ifeval::["{context}" == "installing-restricted-networks-aws"] :restricted: diff --git a/modules/installation-generate-aws-user-infra.adoc b/modules/installation-generate-aws-user-infra.adoc index ce01e25fc5..1aca00a6a1 100644 --- a/modules/installation-generate-aws-user-infra.adoc +++ b/modules/installation-generate-aws-user-infra.adoc @@ -1,6 +1,7 @@ // Module included in the following assemblies: // // * installing/installing_aws_user_infra/installing-aws-user-infra.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc ifeval::["{context}" == "installing-restricted-networks-aws"] :restricted: diff --git a/modules/installation-generate-ignition-configs.adoc b/modules/installation-generate-ignition-configs.adoc index cd0b329b20..ff6049a604 100644 --- a/modules/installation-generate-ignition-configs.adoc +++ b/modules/installation-generate-ignition-configs.adoc @@ -1,6 +1,8 @@ // Module included in the following assemblies: // // * installing/installing_bare_metal/installing-bare-metal.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere.adoc ifeval::["{context}" == "installing-restricted-networks-vsphere"] diff --git a/modules/installation-infrastructure-user-infra.adoc b/modules/installation-infrastructure-user-infra.adoc index a37008714d..dd7db90571 100644 --- a/modules/installation-infrastructure-user-infra.adoc +++ b/modules/installation-infrastructure-user-infra.adoc @@ -1,6 +1,8 @@ // Module included in the following assemblies: // // * installing/installing_bare_metal/installing-bare-metal.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere.adoc [id="installation-infrastructure-user-infra_{context}"] diff --git a/modules/installation-initializing.adoc b/modules/installation-initializing.adoc index 7298d767b1..8702a4785f 100644 --- a/modules/installation-initializing.adoc +++ b/modules/installation-initializing.adoc @@ -4,7 +4,6 @@ // * installing/installing_aws/installing-aws-network-customizations.adoc // * installing/installing_azure/installing-azure-customizations.adoc // * installing/installing_gcp/installing-gcp-customizations.adoc -// * installing/installing_openstack/installing-openstack-installer.adoc // * installing/installing_openstack/installing-openstack-installer-custom.adoc // * installing/installing_openstack/installing-openstack-installer-kuryr.adoc // Consider also adding the installation-configuration-parameters.adoc module. diff --git a/modules/installation-installing-bare-metal.adoc b/modules/installation-installing-bare-metal.adoc index aa7fcb5a52..86599c9f9c 100644 --- a/modules/installation-installing-bare-metal.adoc +++ b/modules/installation-installing-bare-metal.adoc @@ -1,6 +1,8 @@ // Module included in the following assemblies: // // * installing/installing_bare_metal/installing-bare-metal.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere.adoc [id="installation-installing-bare-metal_{context}"] diff --git a/modules/installation-launching-installer.adoc b/modules/installation-launching-installer.adoc index 657fe821df..627c774deb 100644 --- a/modules/installation-launching-installer.adoc +++ b/modules/installation-launching-installer.adoc @@ -1,14 +1,15 @@ // Module included in the following assemblies: // -// * installing/installing_aws/installing-aws-default.adoc // * installing/installing_aws/installing-aws-customizations.adoc +// * installing/installing_aws/installing-aws-default.adoc // * installing/installing_aws/installing-aws-network-customizations.adoc // * installing/installing_azure/installing-azure-customizations.adoc -// * installing/installing_gcp/installing-gcp-default.adoc +// * installing/installing_azure/installing-azure-default.adoc // * installing/installing_gcp/installing-gcp-customizations.adoc -// * installing/installing_openstack/installing-openstack-installer.adoc +// * installing/installing_gcp/installing-gcp-default.adoc // * installing/installing_openstack/installing-openstack-installer-custom.adoc // * installing/installing_openstack/installing-openstack-installer-kuryr.adoc +// * installing/installing_openstack/installing-openstack-installer.adoc // If you use this module in any other assembly, you must update the ifeval // statements. @@ -86,13 +87,12 @@ endif::gcp[] $ ./openshift-install create cluster --dir= \ <1> --log-level info <2> ---- +<1> For ``, specify the ifdef::custom-config[] -<1> For ``, specify the location of your customized -`./install-config.yaml` file. +location of your customized `./install-config.yaml` file. endif::custom-config[] ifdef::no-config[] -<1> For ``, specify the directory name to store the -files that the installation program creates. +directory name to store the files that the installation program creates. endif::no-config[] <2> To view different installation details, specify `warn`, `debug`, or `error` instead of `info`. diff --git a/modules/installation-network-user-infra.adoc b/modules/installation-network-user-infra.adoc index 676c3816b8..26425bc051 100644 --- a/modules/installation-network-user-infra.adoc +++ b/modules/installation-network-user-infra.adoc @@ -1,6 +1,8 @@ // Module included in the following assemblies: // // * installing/installing_bare_metal/installing-bare-metal.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere.adoc [id="installation-network-user-infra_{context}"] diff --git a/modules/installation-obtaining-installer.adoc b/modules/installation-obtaining-installer.adoc index f53f62b9c9..f0a7e913fa 100644 --- a/modules/installation-obtaining-installer.adoc +++ b/modules/installation-obtaining-installer.adoc @@ -1,16 +1,18 @@ // Module included in the following assemblies: // -// * installing/installing_aws/installing-aws-default.adoc -// * installing/installing_aws/installing-aws-customizations.adoc -// * installing/installing_aws/installing-aws-network-customizations.adoc // * installing/installing_aws_user_infra/installing-aws-user-infra.adoc +// * installing/installing_aws/installing-aws-customizations.adoc +// * installing/installing_aws/installing-aws-default.adoc +// * installing/installing_aws/installing-aws-network-customizations.adoc // * installing/installing_azure/installing-azure-customizations.adoc +// * installing/installing_azure/installing-azure-default.adoc // * installing/installing_bare_metal/installing-bare-metal.adoc -// * installing/installing_gcp/installing-gcp-default.adoc // * installing/installing_gcp/installing-gcp-customizations.adoc -// * installing/installing_vsphere/installing-vsphere.adoc -// * installing/installing_openstack/installing-openstack-installer.adoc +// * installing/installing_gcp/installing-gcp-default.adoc // * installing/installing_openstack/installing-openstack-installer-custom.adoc +// * installing/installing_openstack/installing-openstack-installer-kuryr.adoc +// * installing/installing_openstack/installing-openstack-installer.adoc +// * installing/installing_vsphere/installing-vsphere.adoc [id="installation-obtaining-installer_{context}"] = Obtaining the installation program diff --git a/modules/installation-operators-config.adoc b/modules/installation-operators-config.adoc index 08c567ae02..c9e932230c 100644 --- a/modules/installation-operators-config.adoc +++ b/modules/installation-operators-config.adoc @@ -2,6 +2,9 @@ // // * installing/installing_aws_user_infra/installing-aws-user-infra.adoc // * installing/installing_bare_metal/installing-bare-metal.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere.adoc [id="installation-operators-config_{context}"] diff --git a/modules/installation-provide-credentials.adoc b/modules/installation-provide-credentials.adoc deleted file mode 100644 index 3d4a95be4b..0000000000 --- a/modules/installation-provide-credentials.adoc +++ /dev/null @@ -1,66 +0,0 @@ -// Module included in the following assemblies: -// -// * installing/installing_aws/installing-aws-customizations.adoc -// * installing/installing_aws/installing-aws-default.adoc -// * installing/installing_aws/installing-aws-network-customizations.adoc -// * installing/installing_aws_user_infra/installing-aws-user-infra.adoc - -[id="installation-provide-credentials_{context}"] -= Configuring your computer for installation - -Before you install your {product-title} cluster, add your Amazon Web Services (AWS) -credentials to you computer. - -.Prerequisites - -* Configure an AWS account to host your cluster and a user with sufficient -privileges to complete the installation process. You need details about the -account and user, including the access key ID and secret access key values for -the user. -* You must configure a computer that uses a Linux or macOS operating system. - -.Procedure - -. Download the AWS CLI and install it on your computer. See -link:https://docs.aws.amazon.com/cli/latest/userguide/install-bundle.html[Install the AWS CLI Using the Bundled Installer (Linux, macOS, or Unix)] -in the AWS documentation. - -. Provide the configuration details for your account. Run the following command, -and provide details about your account at the prompts: -+ ----- -$ aws configure --profile= <1> - -AWS Access Key ID [None]: accesskey <2> -AWS Secret Access Key [None]: secretkey <2> -Default region name [None]: us-west-2 <3> -Default output format [None]: ----- -<1> Enter a `` to store the credentials in. -<2> Enter the access key ID and secret access key values for the user that you -configured to run the installation program. -<3> Enter the name of the region that you plan to deploy your cluster to. - -. Confirm that your profile is correctly configured: -+ ----- -$ aws sts get-caller-identity --profile= <1> - -output: -{ - "Account": "123123123123", - "UserId": "TH75ISMYR3F4RCHUS3R1D", - "Arn": "arn:aws:iam::123123123123:user/refarchuser" -} ----- -<1> Specify the same ``. -+ -If the command output resembles the sample output, your profile is correctly -configured. If an error displays, configure your credentials again. - -. Save the AWS profile: -+ ----- -$ export AWS_PROFILE= <1> ----- -<1> Enter the `` that you specified. diff --git a/modules/installation-registry-storage-config.adoc b/modules/installation-registry-storage-config.adoc index dba40e8ea1..9def3d67cc 100644 --- a/modules/installation-registry-storage-config.adoc +++ b/modules/installation-registry-storage-config.adoc @@ -2,6 +2,9 @@ // // * installing/installing_aws_user_infra/installing-aws-user-infra.adoc // * installing/installing_bare_metal/installing-bare-metal.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere.adoc [id="installation-registry-storage-config_{context}"] diff --git a/modules/installation-registry-storage-non-production.adoc b/modules/installation-registry-storage-non-production.adoc index ab25e6ff13..b637e61647 100644 --- a/modules/installation-registry-storage-non-production.adoc +++ b/modules/installation-registry-storage-non-production.adoc @@ -2,6 +2,9 @@ // // * installing/installing_aws_user_infra/installing-aws-user-infra.adoc // * installing/installing_bare_metal/installing-bare-metal.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere.adoc [id="installation-registry-storage-non-production_{context}"] diff --git a/modules/installation-requirements-user-infra.adoc b/modules/installation-requirements-user-infra.adoc index e54620f59f..80858a95bd 100644 --- a/modules/installation-requirements-user-infra.adoc +++ b/modules/installation-requirements-user-infra.adoc @@ -1,6 +1,8 @@ // Module included in the following assemblies: // // * installing/installing_bare_metal/installing-bare-metal.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere.adoc [id="installation-requirements-user-infra_{context}"] diff --git a/modules/installation-user-infra-machines-iso.adoc b/modules/installation-user-infra-machines-iso.adoc index 8ff7ea74b5..80ff571ba5 100644 --- a/modules/installation-user-infra-machines-iso.adoc +++ b/modules/installation-user-infra-machines-iso.adoc @@ -1,6 +1,7 @@ // Module included in the following assemblies: // // * installing/installing_bare_metal/installing-bare-metal.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc [id="installation-user-infra-machines-iso_{context}"] = Creating {op-system-first} machines using an ISO image diff --git a/modules/installation-user-infra-machines-pxe.adoc b/modules/installation-user-infra-machines-pxe.adoc index e74201d113..bdfff638f6 100644 --- a/modules/installation-user-infra-machines-pxe.adoc +++ b/modules/installation-user-infra-machines-pxe.adoc @@ -1,6 +1,7 @@ // Module included in the following assemblies: // // * installing/installing_bare_metal/installing-bare-metal.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc [id="installation-user-infra-machines-pxe_{context}"] = Creating {op-system-first} machines by PXE or iPXE booting diff --git a/modules/installation-vsphere-infrastructure.adoc b/modules/installation-vsphere-infrastructure.adoc index 673b0ea29d..afc45894b7 100644 --- a/modules/installation-vsphere-infrastructure.adoc +++ b/modules/installation-vsphere-infrastructure.adoc @@ -1,5 +1,6 @@ // Module included in the following assemblies: // +// * installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere.adoc [id="installation-vsphere-infrastructure_{context}"] diff --git a/modules/installation-vsphere-machines.adoc b/modules/installation-vsphere-machines.adoc index 74d0f5d35f..e1ba992321 100644 --- a/modules/installation-vsphere-machines.adoc +++ b/modules/installation-vsphere-machines.adoc @@ -1,5 +1,6 @@ // Module included in the following assemblies: // +// * installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere.adoc [id="installation-vsphere-machines_{context}"] diff --git a/modules/registry-configuring-storage-aws-user-infra.adoc b/modules/registry-configuring-storage-aws-user-infra.adoc index f8798f063a..d16002073d 100644 --- a/modules/registry-configuring-storage-aws-user-infra.adoc +++ b/modules/registry-configuring-storage-aws-user-infra.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // -//* architecture/installation-.adoc // * installing/installing_aws_user_infra/installing-aws-user-infra.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc // * registry/configuring-registry-storage-aws-user-infrastructure.adoc [id="registry-configuring-storage-aws-user-infra_{context}"] diff --git a/modules/registry-configuring-storage-baremetal.adoc b/modules/registry-configuring-storage-baremetal.adoc index a1795f9f8f..b8bcabc8b3 100644 --- a/modules/registry-configuring-storage-baremetal.adoc +++ b/modules/registry-configuring-storage-baremetal.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // -//* architecture/installation-.adoc // * installing/installing_bare_metal/installing-bare-metal.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc // * registry/configuring-registry-storage-baremetal [id="registry-configuring-storage-baremetal_{context}"] diff --git a/modules/registry-configuring-storage-gcp-user-infra.adoc b/modules/registry-configuring-storage-gcp-user-infra.adoc index d4b28ffe45..500955dcdd 100644 --- a/modules/registry-configuring-storage-gcp-user-infra.adoc +++ b/modules/registry-configuring-storage-gcp-user-infra.adoc @@ -1,6 +1,5 @@ // Module included in the following assemblies: // -// * installing/installing_gcp/installing-gcp-customizations.adoc // * registry/configuring-registry-storage-gcp-user-infrastructure.adoc [id="registry-configuring-storage-gcp-user-infra_{context}"] diff --git a/modules/registry-configuring-storage-vsphere.adoc b/modules/registry-configuring-storage-vsphere.adoc index 044f82e5a6..20eb4f786e 100644 --- a/modules/registry-configuring-storage-vsphere.adoc +++ b/modules/registry-configuring-storage-vsphere.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -//* architecture/installation-.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere.adoc // * registry/configuring-registry-storage-vsphere.adoc diff --git a/modules/ssh-agent-using.adoc b/modules/ssh-agent-using.adoc index 64ebac4407..46a375dcaf 100644 --- a/modules/ssh-agent-using.adoc +++ b/modules/ssh-agent-using.adoc @@ -1,16 +1,20 @@ // Module included in the following assemblies: // -// * installing/installing_aws/installing-aws-default.adoc -// * installing/installing_aws/installing-aws-customizations.adoc -// * installing/installing_aws/installing-aws-network-customizations.adoc // * installing/installing_aws_user_infra/installing-aws-user-infra.adoc +// * installing/installing_aws/installing-aws-customizations.adoc +// * installing/installing_aws/installing-aws-default.adoc +// * installing/installing_aws/installing-aws-network-customizations.adoc // * installing/installing_azure/installing-azure-customizations.adoc +// * installing/installing_azure/installing-azure-default.adoc // * installing/installing_bare_metal/installing-bare-metal.adoc -// * installing/installing_gcp/installing-gcp-default.adoc // * installing/installing_gcp/installing-gcp-customizations.adoc -// * installing/installing_openstack/installing-openstack-installer.adoc +// * installing/installing_gcp/installing-gcp-default.adoc // * installing/installing_openstack/installing-openstack-installer-custom.adoc // * installing/installing_openstack/installing-openstack-installer-kuryr.adoc +// * installing/installing_openstack/installing-openstack-installer.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc +// * installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere.adoc [id="ssh-agent-using_{context}"] diff --git a/serverless/knative-client.adoc b/serverless/knative-client.adoc index be5656a0b7..a6b61966fe 100644 --- a/serverless/knative-client.adoc +++ b/serverless/knative-client.adoc @@ -11,7 +11,7 @@ Knative client does not have its own log in mechanism. To log in to the cluster // Installation -include::modules/cli-install.adoc[leveloffset=+1] +include::modules/cli-installing-cli.adoc[leveloffset=+1] include::modules/serverless-installing-cli-linux.adoc[leveloffset=+2] // RPM install procedure commented out // include::modules/serverless-installing-cli-linux-rpm.adoc[leveloffset=+2]