Use Graphic Tables format for several tables

Use Graphic Tables format described in the documentation:
http://docs.openstack.org/contributor-guide/rst-conv/tables.html for
couple tables:
 - List of default flavors.
 - Placement requirements summary per a service of OpenStack platform.

Also replaced '-' to '--', which will be compiled to '-' instead of
bullet list.

Change-Id: Iae4430e26ca618a1525aa7ae7c77e72e984aaca3
This commit is contained in:
Sergey Kraynev 2016-12-26 12:25:01 +04:00
parent 992e4ec2a0
commit b4881cfa73
2 changed files with 42 additions and 72 deletions

View File

@ -198,21 +198,16 @@ Flavor bootstrapping
The CCP automatically creates list of the default flavors, which are mentioned
in the table below:
+-----------+----+-------+------+-------+
| Name | ID | RAM | Disk | VCPUs |
+===========+====+=======+======+=======+
| m1.test | 0 | 128 | 1 | 1 |
+-----------+----+-------+------+-------+
| m1.tiny | 1 | 512 | 1 | 1 |
+-----------+----+-------+------+-------+
| m1.small | 2 | 2048 | 20 | 1 |
+-----------+----+-------+------+-------+
| m1.medium | 3 | 4096 | 40 | 2 |
+-----------+----+-------+------+-------+
| m1.large | 4 | 8192 | 80 | 4 |
+-----------+----+-------+------+-------+
| m1.xlarge | 5 | 16384 | 160 | 8 |
+-----------+----+-------+------+-------+
========== == ====== ===== =====
Name ID RAM Disk VCPUs
========== == ====== ===== =====
m1.test 0 128 1 1
m1.tiny 1 512 1 1
m1.small 2 2048 20 1
m1.medium 3 4096 40 2
m1.large 4 8192 80 4
m1.xlarge 5 16384 160 8
========== == ====== ===== =====
Creation of the flavors is handled by nova post deployment job
**nova-create-default-flavors**, which uses Bash script from fuel-ccp-nova

View File

@ -1163,64 +1163,39 @@ Services Placement Summary
The following table summarizes the placement requirements of the
services described above.
Table 1. Placement requirements summary per a service of OpenStack platform
'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+--------------------------+-----------------------+-----------------------------+--------------------+----------------------------+
| Service | Number Of Instances | Number Of Dedicated Nodes | Can Share A Node | Requires a Load Balancer |
+==========================+=======================+=============================+====================+============================+
| keystone-all | 5 | 5 | no | yes |
+--------------------------+-----------------------+-----------------------------+--------------------+----------------------------+
| nova-api | 3 | 3 | no | yes |
+--------------------------+-----------------------+-----------------------------+--------------------+----------------------------+
| nova-scheduler | 8 | - | yes | no |
+--------------------------+-----------------------+-----------------------------+--------------------+----------------------------+
| nova-conductor | 3 | 3 | no | no |
+--------------------------+-----------------------+-----------------------------+--------------------+----------------------------+
| nova-compute\* | - | - | yes | no |
+--------------------------+-----------------------+-----------------------------+--------------------+----------------------------+
| neutron-server | 3 | - | yes | no |
+--------------------------+-----------------------+-----------------------------+--------------------+----------------------------+
| neutron-dhcp-agent | 3 | - | yes | no |
+--------------------------+-----------------------+-----------------------------+--------------------+----------------------------+
| neutron-l2-agent\* | - | - | yes | no |
+--------------------------+-----------------------+-----------------------------+--------------------+----------------------------+
| neutron-l3-agent | 3 | - | yes | no |
+--------------------------+-----------------------+-----------------------------+--------------------+----------------------------+
| neutron-metadata-agent | 3 | - | yes | no |
+--------------------------+-----------------------+-----------------------------+--------------------+----------------------------+
| glance-api | 3 | - | yes | yes |
+--------------------------+-----------------------+-----------------------------+--------------------+----------------------------+
| glance-registry | 3 | - | yes | no |
+--------------------------+-----------------------+-----------------------------+--------------------+----------------------------+
| cinder-api | 3 | - | yes | yes |
+--------------------------+-----------------------+-----------------------------+--------------------+----------------------------+
| cinder-scheduler | 3 | - | yes | no |
+--------------------------+-----------------------+-----------------------------+--------------------+----------------------------+
| cinder-volume | - | - | yes | no |
+--------------------------+-----------------------+-----------------------------+--------------------+----------------------------+
| horizon/apache2 | 3 | 3 | no | yes |
+--------------------------+-----------------------+-----------------------------+--------------------+----------------------------+
| rabbitmq-server | 3 | 3 | no | no |
+--------------------------+-----------------------+-----------------------------+--------------------+----------------------------+
| mysqld-server | 3 | 3 | no | yes\*\* |
+--------------------------+-----------------------+-----------------------------+--------------------+----------------------------+
| ceph-mon | 3 | 3 | no | no |
+--------------------------+-----------------------+-----------------------------+--------------------+----------------------------+
| ceph-osd\*\*\* | - | - | no | no |
+--------------------------+-----------------------+-----------------------------+--------------------+----------------------------+
| radosgw | 3 | - | yes | yes |
+--------------------------+-----------------------+-----------------------------+--------------------+----------------------------+
| lma-aggregator | 1 | 1 | yes | no |
+--------------------------+-----------------------+-----------------------------+--------------------+----------------------------+
| Influxdb + Grafana | 3 | 3 | no | no |
+--------------------------+-----------------------+-----------------------------+--------------------+----------------------------+
| Elasticsearch + Kibana | 3 | 3 | no | no |
+--------------------------+-----------------------+-----------------------------+--------------------+----------------------------+
| Nagios | 1 | - | yes | no |
+--------------------------+-----------------------+-----------------------------+--------------------+----------------------------+
| **TOTAL** | - | 30 | - | - |
+--------------------------+-----------------------+-----------------------------+--------------------+----------------------------+
.. table:: **Placement requirements summary per a service of OpenStack platform**
======================== ==================== =========================== ================== ==========================
Service Number Of Instances Number Of Dedicated Nodes Can Share A Node Requires a Load Balancer
======================== ==================== =========================== ================== ==========================
keystone-all 5 5 no yes
nova-api 3 3 no yes
nova-scheduler 8 -- yes no
nova-conductor 3 3 no no
nova-compute\* -- -- yes no
neutron-server 3 -- yes no
neutron-dhcp-agent 3 -- yes no
neutron-l2-agent\* -- -- yes no
neutron-l3-agent 3 -- yes no
neutron-metadata-agent 3 -- yes no
glance-api 3 -- yes yes
glance-registry 3 -- yes no
cinder-api 3 -- yes yes
cinder-scheduler 3 -- yes no
cinder-volume -- -- yes no
horizon/apache2 3 3 no yes
rabbitmq-server 3 3 no no
mysqld-server 3 3 no yes\*\*
ceph-mon 3 3 no no
ceph-osd\*\*\* -- -- no no
radosgw 3 -- yes yes
lma-aggregator 1 1 yes no
Influxdb + Grafana 3 3 no no
Elasticsearch + Kibana 3 3 no no
Nagios 1 -- yes no
**TOTAL** -- 30 -- --
======================== ==================== =========================== ================== ==========================
\* this service runs on a Compute/hypervisor host