From 269c6ba48866ac0d6a362ec88894554cfd8230ac Mon Sep 17 00:00:00 2001 From: Alex Dellapenta Date: Mon, 2 Apr 2018 11:35:34 -0400 Subject: [PATCH 1/2] Flip planning bullets + ifdef openstack on origin content --- getting_started/administrators.adoc | 12 ++++++++++++ install_config/install/planning.adoc | 23 +++++++++++++++++++---- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/getting_started/administrators.adoc b/getting_started/administrators.adoc index aca1109db5fa..ff95290fb4e4 100644 --- a/getting_started/administrators.adoc +++ b/getting_started/administrators.adoc @@ -40,6 +40,18 @@ networking. Ensure that local firewall rules and other software making iptable changes do not alter the {product-title} and Docker service setup. ==== +ifdef::openshift-origin[] +[[get-started-cloud-providers]] +=== On-premise vs Cloud Providers + +{product-title} can be installed on-premise or hosted on public or private +clouds. For information, see +xref:../install_config/install/advanced_install.adoc#advanced-cloud-providers[see the advanced installation guide]. +endif::[] + +Once you have your cluster nodes provisioned, choose the +installation method that fits your case the best. + [[installation-methods]] == Installation Methods diff --git a/install_config/install/planning.adoc b/install_config/install/planning.adoc index 72e1845888bc..4603a9571ec5 100644 --- a/install_config/install/planning.adoc +++ b/install_config/install/planning.adoc @@ -17,18 +17,23 @@ toc::[] For production environments, several factors influence installation. Consider the following questions as you read through the documentation: +ifdef::openshift-origin[] +* _Do you install on-premises or in public/private clouds?_ The xref:planning-cloud-providers[Installation Methods] +section provides more information about the cloud providers options available. +endif::[] + * _Which installation method do you want to use?_ The xref:installation-methods[Installation Methods] section provides some information about the quick and advanced installation methods. -* _How many hosts do you require in the cluster?_ The xref:environment-scenarios[Environment Scenarios] -section provides multiple examples of Single Master and Multiple Master -configurations. - * _How many pods are required in your cluster?_ The xref:sizing[Sizing Considerations] section provides limits for nodes and pods so you can calculate how large your environment needs to be. +* _How many hosts do you require in the cluster?_ The xref:environment-scenarios[Environment Scenarios] +section provides multiple examples of Single Master and Multiple Master +configurations. + * _Is xref:../../admin_guide/high_availability.adoc#admin-guide-high-availability[high availability] required?_ High availability is recommended for fault tolerance. In this situation, you might aim to use the xref:multi-masters-using-native-ha[Multiple Masters Using Native HA] @@ -72,6 +77,16 @@ the same installer tool. If you wanted to later switch to using the advanced method, you can create an inventory file for your configuration and carry on that way. +ifdef::openshift-origin[] +[[planning-cloud-providers]] +=== On-premises vs Cloud Providers + +{product-title} can be installed on-premises or hosted on public or private +clouds. Ansible playbooks can help you with automating +the provisioning and installation processes. For information, see +xref:../../install_config/install/advanced_install.adoc#advanced-cloud-providers[Advanced Installation]. +endif::[] + [[sizing]] == Sizing Considerations From ac1d5fd59aae2037bf03f9194871f39d92239ac8 Mon Sep 17 00:00:00 2001 From: Alex Dellapenta Date: Mon, 2 Apr 2018 11:45:55 -0400 Subject: [PATCH 2/2] Fix origin endif getting_started/admin --- getting_started/administrators.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/getting_started/administrators.adoc b/getting_started/administrators.adoc index ff95290fb4e4..342c655d26ba 100644 --- a/getting_started/administrators.adoc +++ b/getting_started/administrators.adoc @@ -47,10 +47,10 @@ ifdef::openshift-origin[] {product-title} can be installed on-premise or hosted on public or private clouds. For information, see xref:../install_config/install/advanced_install.adoc#advanced-cloud-providers[see the advanced installation guide]. -endif::[] Once you have your cluster nodes provisioned, choose the installation method that fits your case the best. +endif::[] [[installation-methods]] == Installation Methods