Removes Mirantis-specific content
* Edits the Fuel Installation Guide and Fuel User Guide to remove Mirantis-specific information. * Edits setup.cfg and conf.py. * Replaces the Fuel login screen with a new one. Change-Id: Ic7dfd0df3dba6ca2eb2d61ac31d3383600696529
This commit is contained in:
parent
8db61f1a2c
commit
d3552f3fb7
Binary file not shown.
Before Width: | Height: | Size: 31 KiB After Width: | Height: | Size: 37 KiB |
2
conf.py
2
conf.py
@ -52,7 +52,7 @@ master_doc = 'index'
|
|||||||
|
|
||||||
# General information about the project.
|
# General information about the project.
|
||||||
project = u'Fuel'
|
project = u'Fuel'
|
||||||
copyright = u'2012-2016, Mirantis'
|
copyright = u'2012-2016, OpenStack'
|
||||||
|
|
||||||
# The version info for the project you're documenting, acts as replacement for
|
# The version info for the project you're documenting, acts as replacement for
|
||||||
# |version| and |release|, also used in various other places throughout the
|
# |version| and |release|, also used in various other places throughout the
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
[metadata]
|
[metadata]
|
||||||
name = fuel-docs
|
name = fuel-docs
|
||||||
version = 7.0.0
|
version = 9.0.0
|
||||||
author = Mirantis
|
author = OpenStack
|
||||||
author-email = fuel-dev@lists.launchpad.net
|
author-email = fuel-dev@lists.launchpad.net
|
||||||
|
|
||||||
[build_sphinx]
|
[build_sphinx]
|
||||||
|
@ -16,7 +16,7 @@ following error messages:
|
|||||||
While you don't activate any bootstrap - new nodes cannot be discovered
|
While you don't activate any bootstrap - new nodes cannot be discovered
|
||||||
and added to cluster.
|
and added to cluster.
|
||||||
For more information please visit
|
For more information please visit
|
||||||
https://docs.mirantis.com/openstack/fuel/fuel-master/"
|
http://docs.openstack.org/developer/fuel-docs/userdocs/fuel-install-guide/bootstrap/bootstrap_troubleshoot.html"
|
||||||
|
|
||||||
or
|
or
|
||||||
|
|
||||||
@ -29,7 +29,7 @@ or
|
|||||||
While you don't activate any bootstrap - new nodes cannot be discovered
|
While you don't activate any bootstrap - new nodes cannot be discovered
|
||||||
and added to cluster.
|
and added to cluster.
|
||||||
For more information please visit
|
For more information please visit
|
||||||
https://docs.mirantis.com/openstack/fuel/fuel-master/"
|
http://docs.openstack.org/developer/fuel-docs/userdocs/fuel-install-guide/bootstrap/bootstrap_troubleshoot.html"
|
||||||
|
|
||||||
|
|
||||||
You typically receive such error messages when software
|
You typically receive such error messages when software
|
||||||
|
@ -130,8 +130,6 @@ To verify the packages are up-to-date on the Fuel Slave nodes:
|
|||||||
|
|
||||||
.. note::
|
.. note::
|
||||||
The rollback instructions listed here are for advanced administrators.
|
The rollback instructions listed here are for advanced administrators.
|
||||||
If you are not sure how to plan and execute the rollbacks,
|
|
||||||
your best option is to contact `Mirantis support <https://www.mirantis.com/services/enterprise-support-services/>`__.
|
|
||||||
|
|
||||||
Roll back the Fuel Master node
|
Roll back the Fuel Master node
|
||||||
------------------------------
|
------------------------------
|
||||||
|
@ -3,9 +3,8 @@
|
|||||||
Boot the Fuel Master node
|
Boot the Fuel Master node
|
||||||
-------------------------
|
-------------------------
|
||||||
|
|
||||||
#. When the Mirantis ISO boot menu appears, press the **Tab** key
|
#. When the boot menu appears, press the **Tab** key on the keyboard and
|
||||||
on the keyboard and modify the last kernel parameter ``showmenu``
|
modify the last kernel parameter ``showmenu`` to ``yes``. Press **Enter**.
|
||||||
to ``yes``. Press **Enter**.
|
|
||||||
#. Wait for the Fuel Master node installation to complete.
|
#. Wait for the Fuel Master node installation to complete.
|
||||||
|
|
||||||
To access the Fuel Web UI, your browser must have an access
|
To access the Fuel Web UI, your browser must have an access
|
||||||
|
@ -3,8 +3,8 @@
|
|||||||
Configure ESXi host networking
|
Configure ESXi host networking
|
||||||
------------------------------
|
------------------------------
|
||||||
|
|
||||||
To integrate Mirantis OpenStack with VMware vCenter,
|
To integrate OpenStack with VMware vCenter, you must configure the VMware ESXi
|
||||||
you must configure the VMware ESXi host networking.
|
host networking.
|
||||||
|
|
||||||
**To configure ESXi host networking**:
|
**To configure ESXi host networking**:
|
||||||
|
|
||||||
|
@ -12,8 +12,7 @@ operating system to run the Fuel Master node on it.
|
|||||||
#. Click **Create a Virtual Machine**.
|
#. Click **Create a Virtual Machine**.
|
||||||
#. Click **Create a new virtual machine**.
|
#. Click **Create a new virtual machine**.
|
||||||
Do not use templates.
|
Do not use templates.
|
||||||
#. Name your new VM and choose the datacenter where the Mirantis ISO
|
#. Name your new VM and select the datacenter where the Fuel ISO is located.
|
||||||
is located.
|
|
||||||
#. Select a compute resource (ESXi host), storage, and compatibility
|
#. Select a compute resource (ESXi host), storage, and compatibility
|
||||||
for the VM.
|
for the VM.
|
||||||
#. Select a guest operating system.
|
#. Select a guest operating system.
|
||||||
|
@ -3,9 +3,8 @@
|
|||||||
VMware vSphere prerequisites
|
VMware vSphere prerequisites
|
||||||
----------------------------
|
----------------------------
|
||||||
|
|
||||||
Before you install Fuel and use your Mirantis OpenStack environment
|
Before you install Fuel and use your OpenStack environment in intergration
|
||||||
in intergration with vSphere, you must configure all components
|
with vSphere, you must configure all components of VMware vSphere.
|
||||||
of VMware vSphere.
|
|
||||||
|
|
||||||
.. note::
|
.. note::
|
||||||
|
|
||||||
|
@ -13,5 +13,5 @@ and upload it do a vSphere datastore.
|
|||||||
#. Go to the Datastores and choose your datastore.
|
#. Go to the Datastores and choose your datastore.
|
||||||
#. Go to the Actions menu and select **Browse Files**.
|
#. Go to the Actions menu and select **Browse Files**.
|
||||||
#. Click the **Upload Files** icon, browse your filesystem,
|
#. Click the **Upload Files** icon, browse your filesystem,
|
||||||
and select your Mirantis ISO.
|
and select your Fuel ISO.
|
||||||
#. Proceed to :ref:`vsphere_configure_network`.
|
#. Proceed to :ref:`vsphere_configure_network`.
|
||||||
|
@ -170,7 +170,7 @@ To delete the environment:
|
|||||||
|
|
||||||
fuel --env <env_id> env delete
|
fuel --env <env_id> env delete
|
||||||
|
|
||||||
To update the Mirantis OpenStack environment to a newer version
|
To update the OpenStack environment to a newer version
|
||||||
(available since Fuel 5.1):
|
(available since Fuel 5.1):
|
||||||
|
|
||||||
::
|
::
|
||||||
|
@ -12,9 +12,9 @@ Fuel plugins may have additional hardware requirements and architectural
|
|||||||
limitations. For more information, see: *System requirements* in the
|
limitations. For more information, see: *System requirements* in the
|
||||||
*Fuel Installation Guide*.
|
*Fuel Installation Guide*.
|
||||||
|
|
||||||
.. If you are deploying a Mirantis OpenStack environment
|
.. If you are deploying an OpenStack environment that is integrated with
|
||||||
that is integrated with VMware vSphere, your environment must meet
|
VMware vSphere, your environment must meet the prerequisites listed in
|
||||||
the prerequisites listed in *Install VMware* in *Fuel Installation Guide*.
|
*Install VMware* in *Fuel Installation Guide*.
|
||||||
|
|
||||||
**To create an OpenStack environment:**
|
**To create an OpenStack environment:**
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@ add a Linux based image to Murano.
|
|||||||
To prepare the OpenStack Application Catalog for testing,
|
To prepare the OpenStack Application Catalog for testing,
|
||||||
add a Linux-based image to Murano. You can download the `pre-built
|
add a Linux-based image to Murano. You can download the `pre-built
|
||||||
Murano image
|
Murano image
|
||||||
<http://murano-files.mirantis.com/ubuntu_14_04-murano-agent_stable_juno.qcow2¬>`_
|
<http://storage.apps.openstack.org/images/ubuntu-14.04-m-agent.qcow2>`_
|
||||||
or build your own as described in `Murano documentation
|
or build your own as described in `Murano documentation
|
||||||
<http://murano.readthedocs.org/en/latest/image_builders/index.html>`_.
|
<http://murano.readthedocs.org/en/latest/image_builders/index.html>`_.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user