diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/xci-overview.rst | 2 | ||||
| -rw-r--r-- | docs/xci-user-guide.rst | 21 |
2 files changed, 2 insertions, 21 deletions
diff --git a/docs/xci-overview.rst b/docs/xci-overview.rst index 575eb37c..9b225ec1 100644 --- a/docs/xci-overview.rst +++ b/docs/xci-overview.rst @@ -138,7 +138,7 @@ Multi-distro Support -------------------- Giving choice and not imposing things on developers and users are two -of the important aspects of XCI. This means that if they want to have all in one +of the important aspects of XCI. This means that if they want to have smaller deployments, they should be able to do that by using :ref:`different flavors <sandbox-flavors>` provided by XCI. diff --git a/docs/xci-user-guide.rst b/docs/xci-user-guide.rst index 8f506fc4..5e76ca16 100644 --- a/docs/xci-user-guide.rst +++ b/docs/xci-user-guide.rst @@ -97,11 +97,6 @@ Available flavors are listed on the table below. +------------------+------------------------+---------------------+--------------------------+--------------------------+ | Flavor | Number of VM Nodes | VM Specs Per Node | Time Estimates Openstack | Time Estimates Kubernetes| +==================+========================+=====================+==========================+==========================+ -| All in One (aio) | | 1 VM Node | | vCPUs: 8 | | Provisioning: 10 mins | | Provisioning: 10 mins | -| | | controller & compute | | RAM: 12GB | | Deployment: 90 mins | | Deployment: 30 mins | -| | | on single/same node | | Disk: 80GB | | Total: 100 mins | | Total: 40 mins | -| | | 1 compute node | | NICs: 1 | | | | | -+------------------+------------------------+---------------------+--------------------------+--------------------------+ | Mini | | 3 VM Nodes | | vCPUs: 6 | | Provisioning: 12 mins | | Provisioning: 12 mins | | | | 1 deployment node | | RAM: 12GB | | Deployment: 65 mins | | Deployment: 35 mins | | | | 1 controller node | | Disk: 80GB | | Total: 77 mins | | Total: 47 mins | @@ -150,14 +145,6 @@ ongoing. The differences between the flavors are documented below. -**All in One** - -As shown on the table in the previous section, this flavor consists of a single -node. All the OpenStack services, including compute run on the same node. - -The flavor All in One (aio) is deployed based on the process described in the -upstream documentation. Please check `OpenStack Ansible Developer Quick Start <https://docs.openstack.org/openstack-ansible/pike/contributor/quickstart-aio.html>`_ for details. - **Mini/No HA/HA** These flavors consist of multiple nodes. @@ -184,12 +171,6 @@ are supported currently The differences between the flavors are documented below. -**All in One** - -As shown on the table in the previous section, this flavor consists of a single -node. All the kubernetes services run on the same node, which acts as master -and worker at the same time. - **Mini/No HA/HA** These flavors consist of multiple nodes. @@ -257,7 +238,7 @@ How to Use | ``./xci-deploy.sh`` Issuing above command will start the sandbox deployment using the default -flavor ``aio`` and the verified versions of upstream components. +flavor ``mini`` and the verified versions of upstream components. (`pinned-versions <https://git.opnfv.org/releng-xci/tree/xci/config/pinned-versions>`_). The sandbox should be ready between 1,5 and 2 hours depending on the host machine. |