From 5035a2acebfeedbc94b8c80738eee940336d49f0 Mon Sep 17 00:00:00 2001 From: Michael Burke Date: Mon, 11 Dec 2017 16:40:08 -0500 Subject: [PATCH] followup edits to bogdando PR --- getting_started/administrators.adoc | 6 ++-- install_config/install/advanced_install.adoc | 37 ++++++++------------ install_config/install/planning.adoc | 20 +++-------- 3 files changed, 21 insertions(+), 42 deletions(-) diff --git a/getting_started/administrators.adoc b/getting_started/administrators.adoc index ad7eee807039..eb1bc7568a55 100644 --- a/getting_started/administrators.adoc +++ b/getting_started/administrators.adoc @@ -41,10 +41,10 @@ changes do not alter the {product-title} and Docker service setup. ==== [[get-started-cloud-providers]] -=== On-premises vs Cloud Providers +=== On-premise vs Cloud Providers -{product-title} can be installed on-premises or hosted on public or private -clouds. For more details, +{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]. Once you have your cluster nodes provisioned, choose the diff --git a/install_config/install/advanced_install.adoc b/install_config/install/advanced_install.adoc index f1ea291585e2..6562ea8c7802 100644 --- a/install_config/install/advanced_install.adoc +++ b/install_config/install/advanced_install.adoc @@ -84,33 +84,24 @@ you can continue in this topic to xref:configuring-ansible[Configuring Ansible Inventory Files]. [[advanced-cloud-providers]] -=== Choosing clouds over on-premises +=== Cloud installation -Provisioning of VMs in a cloud, defining your cloud hosted infrastructure and -applying post-provision configuration may be assisted with Ansible -automation playbooks for the supported cloud providers. This advanced installation -guide is happen to fulfill that purpose as well. +{product-title} VMs can be provisioned in a cloud environment. -ifdef::openshift-enterprise[] -==== -A managed dedicated cloud hosted infrastructure may be alternatively -operated as a service by Red Hat, see the -link:https://www.openshift.com/dedicated/index.html[OpenShift Dedicated] -product offering for more details. -==== -endif::[] +You can use Ansible playbooks to automate defining of your cloud hosted infrastructure and +applying post-provision configuration for the supported cloud providers. Follow these advanced installation +to help you create the needed playbooks. ==== OpenStack provider -In order to install {product-title} with manual steps using OpenStack CLI, -see the -link:https://access.redhat.com/documentation/en-us/reference_architectures/2017/html-single/deploying_and_managing_red_hat_openshift_container_platform_3.6_on_red_hat_openstack_platform_10[reference architecture], -which is actual for {product-title} 3.6 and Red Hat OpenStack Platform 10. +As an alternate, you can install {product-title} using the OpenStack CLI. +For more information, See the +link:https://access.redhat.com/documentation/en-us/reference_architectures/2017/html-single/deploying_and_managing_red_hat_openshift_container_platform_3.6_on_red_hat_openstack_platform_10[reference architecture] for {product-title} 3.6 and Red Hat OpenStack Platform 10. -As a prerequisite, you will have to provision VMs and configure the cloud -infrastructure, like network, storage, firewall and security groups. -These configuration tasks may be assisted by that reference architecture, -the +As a prerequisite to using the Openstack CLI, first provision VMs and configure the cloud +infrastructure, such as networking, storage, firewall and security groups. +For information on these configuration tasks using the reference architecture, +see the xref:../../install_config/install/prerequisites#prereq-cloud-provider-considerations[cloud provider considerations] and link:https://github.com/openshift/openshift-ansible/tree/master/playbooks/openstack[Ansible playbooks] to automate it. See also @@ -124,9 +115,9 @@ ifdef::openshift-enterprise[] The reference architecture for automated installations based on link:https://docs.openstack.org/heat/latest[OpenStack Heat] templates for link:https://access.redhat.com/documentation/en-us/reference_architectures/2017/html/deploying_red_hat_openshift_container_platform_3.4_on_red_hat_openstack_platform_10[{product-title} 3.4 on Red Hat OpenStack Platform 10] -is not supported anymore. For OSP 13 time frame, it is being replaced with the +is no longer supported. For the Red Hat OpenStack 13 release, this process is replaced with the link:https://github.com/openshift/openshift-ansible/tree/master/playbooks/openstack[Ansible driven deployment solution]. -For automated installations, please follow that guide instead! +For automated installations, please follow that guide. ==== endif::[] diff --git a/install_config/install/planning.adoc b/install_config/install/planning.adoc index 8d17ebbb6cba..668cd10ec419 100644 --- a/install_config/install/planning.adoc +++ b/install_config/install/planning.adoc @@ -20,19 +20,6 @@ the following questions as you read through the documentation: * _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. -ifdef::openshift-enterprise[] -* _Do you need a dedicated cloud hosted infrastructure?_ There might be -managed multi-tenant alternatives as well. For example, operated as a service -by Red Hat cloud hosted infrastructure where your workloads run -alongside other customers' containers. If that fits your case, see -link:https://www.openshift.com/[OpenShift Online] for more details. - -* _Will you manage your dedicated cloud hosted infrastructure or prefer -having it managed as a service?_ See the -link:https://www.openshift.com/dedicated/index.html[OpenShift Dedicated] -product offering that might fit the case better. -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. @@ -85,9 +72,10 @@ that way. === On-premises vs Cloud Providers {product-title} can be installed on-premises or hosted on public or private -clouds. The aforementioned Ansible playbooks will help you with automation of -the provisioning and installation processes. For more details, -xref:../../install_config/install/advanced_install.adoc#advanced-cloud-providers[see the advanced installation guide]. +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]. + [[sizing]] == Sizing Considerations