Browse Source

Merge "Add description for nodes section"

Jenkins 2 years ago
parent
commit
2c69534640
2 changed files with 49 additions and 2 deletions
  1. 11
    2
      doc/source/config/types.rst
  2. 38
    0
      etc/topology-with-large-number-of-nodes.yaml

+ 11
- 2
doc/source/config/types.rst View File

@@ -481,8 +481,17 @@ Isolation:
481 481
 
482 482
 Allowed content:
483 483
 
484
-- This key has a restricted format, example of this format can be found in
485
-  ``fuel-ccp`` git repository in ``etc/topology-example.yaml`` file.
484
+- This key contains a regular expression to match one or several nodes at once,
485
+  example can be found in ``fuel-ccp`` git repository in
486
+  ``etc/topology-example.yaml`` file.
487
+  If your environment contains more than 9 nodes, you must explicitly specify
488
+  the "end-of-line", because expression like node([1-5]|10|11) will also match
489
+  node12, node13 etc. Example can be found in ``fuel-ccp`` git repository in
490
+  ``etc/topology-with-large-number-of-nodes.yaml`` file.
491
+
492
+- The roles specified in the 'roles' key for node will apply to all matched
493
+  nodes. If a node matches several 'nodes' keys, each with different roles,
494
+  then roles from all keys will be added to node.
486 495
 
487 496
 .. _registry:
488 497
 

+ 38
- 0
etc/topology-with-large-number-of-nodes.yaml View File

@@ -0,0 +1,38 @@
1
+nodes:
2
+  node[1-3]$:
3
+    roles:
4
+      - controller
5
+      - openvswitch
6
+  node([4-9]|10|11|12)$:
7
+    roles:
8
+      - compute
9
+      - openvswitch
10
+roles:
11
+  controller:
12
+    - etcd
13
+    - glance-api
14
+    - glance-registry
15
+    - heat-api-cfn
16
+    - heat-api
17
+    - heat-engine
18
+    - horizon
19
+    - keystone
20
+    - mariadb
21
+    - memcached
22
+    - neutron-dhcp-agent
23
+    - neutron-l3-agent
24
+    - neutron-metadata-agent
25
+    - neutron-server
26
+    - nova-api
27
+    - nova-conductor
28
+    - nova-consoleauth
29
+    - nova-novncproxy
30
+    - nova-scheduler
31
+    - rabbitmq
32
+  compute:
33
+    - nova-compute
34
+    - nova-libvirt
35
+  openvswitch:
36
+    - neutron-openvswitch-agent
37
+    - openvswitch-db
38
+    - openvswitch-vswitchd

Loading…
Cancel
Save