diff --git a/contents/contents-planning-guide.rst b/contents/contents-planning-guide.rst index ee308a923..1f25d7979 100644 --- a/contents/contents-planning-guide.rst +++ b/contents/contents-planning-guide.rst @@ -2,7 +2,6 @@ .. include:: /pages/planning-guide/0020-system-requirements.rst .. include:: /pages/planning-guide/4000-planning-summary.rst .. include:: /pages/planning-guide/4200-net-topology.rst -.. include:: /pages/planning-guide/4300-linux-distro.rst .. include:: /pages/planning-guide/4360-storage-plan.rst .. include:: /pages/planning-guide/4400-nodes-roles.rst .. include:: /pages/planning-guide/4450-monitoring.rst diff --git a/pages/planning-guide/0020-system-requirements.rst b/pages/planning-guide/0020-system-requirements.rst index 7d7929702..1c1cdb292 100644 --- a/pages/planning-guide/0020-system-requirements.rst +++ b/pages/planning-guide/0020-system-requirements.rst @@ -38,7 +38,6 @@ Some general remarks: - Select peripheral hardware that is supported by the operating system distribution that you are using for the target nodes - (see :ref:`linux-distro-plan`) and for the VM instances that will be deployed. Integrating new hardware drivers diff --git a/pages/planning-guide/4000-planning-summary.rst b/pages/planning-guide/4000-planning-summary.rst index 85cb88a42..4d78bfd56 100644 --- a/pages/planning-guide/4000-planning-summary.rst +++ b/pages/planning-guide/4000-planning-summary.rst @@ -21,9 +21,6 @@ complete to plan the Mirantis OpenStack deployment. | Select a network topology | See :ref:`net-topology-plan` | | | | +----------------------------+-------------------------------------------+ -| Choose the Linux distro | See :ref:`linux-distro-plan` | -| to use on your nodes | | -+----------------------------+-------------------------------------------+ | Determine how many nodes | See :ref:`nodes-roles-plan` | | to deploy and which roles | | | to assign to each and | | diff --git a/pages/planning-guide/4300-linux-distro.rst b/pages/planning-guide/4300-linux-distro.rst deleted file mode 100644 index e5e644a63..000000000 --- a/pages/planning-guide/4300-linux-distro.rst +++ /dev/null @@ -1,24 +0,0 @@ - -.. _linux-distro-plan: - -Linux Distribution for Nodes -============================ - -Fuel allows you to deploy either the CentOS or Ubuntu -Linux distribution as the Host O/S on the nodes. -All nodes in the environment must run the same Linux distribution. -Often, the choice is made based on personal preference; -many administrative tasks on the nodes -must be performed at shell level -and many people choose the distribution -with which they are most comfortable. - -Some specific considerations: - -- Each distribution has some hardware support issues. - See :ref:`release-notes` for details about known issues. -- In particular, the CentOS version used for OpenStack - does not include native support for VLANs - while the Ubuntu version does. -- CentOS supports .rpm packages; Ubuntu supports .deb packages. - diff --git a/pages/reference-architecture/9000-fuel-provision.rst b/pages/reference-architecture/9000-fuel-provision.rst index d9c29cd35..d4a71ea94 100644 --- a/pages/reference-architecture/9000-fuel-provision.rst +++ b/pages/reference-architecture/9000-fuel-provision.rst @@ -30,10 +30,6 @@ repositories in a directory which is then packed into the operating system image. The build script is run once no matter how many nodes one is going to deploy. -Currently, the CentOS image is built at the development stage and then -this image is put into Mirantis OpenStack ISO and used for all CentOS -based environments. - Ubuntu images are built on the master node, one operating system image per environment. We need to build different images for each environment because each environment has its own set of repositories. In order to diff --git a/pages/user-guide/7300-vcenter.rst b/pages/user-guide/7300-vcenter.rst index 6059be546..2918c87ed 100644 --- a/pages/user-guide/7300-vcenter.rst +++ b/pages/user-guide/7300-vcenter.rst @@ -29,12 +29,11 @@ to launch the wizard that creates a new OpenStack environment. .. _vcenter-start-create-env-ug: -Create Environment and Choose Distribution for vCenter -++++++++++++++++++++++++++++++++++++++++++++++++++++++ +Create Environment +++++++++++++++++++ -Either the CentOS or Ubuntu distro -can be used as the host operating system on the Slave nodes -for environments that support integration with vSphere: +Select an OpenStack release and type a name for the OpenStack +environment: .. image:: /_images/user_screen_shots/vcenter-create-env.png diff --git a/pages/user-guide/initialize-fuel/0600-boot-nodes.rst b/pages/user-guide/initialize-fuel/0600-boot-nodes.rst index 49fc23ab9..33a3c28f3 100644 --- a/pages/user-guide/initialize-fuel/0600-boot-nodes.rst +++ b/pages/user-guide/initialize-fuel/0600-boot-nodes.rst @@ -20,9 +20,8 @@ Master Node. #. Each node sends out DHCP discovery requests and gets the response from the Fuel Master node that runs the DHCP server. #. When a node receives the response from the Fuel Master node, - it fetches the pxelinux bootloader - and then the bootstrap image (CentOS based Linux in memory) - from the Fuel Master node's TFTP server and boots into it. + it fetches the pxelinux bootloader and then the bootstrap image from the + Fuel Master node's TFTP server and boots into it. #. When this image is loaded, it reports the node's readiness and configuration to the Fuel Master. This can take a few minutes.