Browse Source

Template for nsxt is changed

 - amount of cpu for controller nodes is increased to 4
 - DRIVER_STP environment variable is added, true
 - DRIVER_HPET environment variable is added, false
 - DRIVER_USE_HOST_CPU environment variable is added, false
 - a template for fuel-devops3 is added
 - not controller slaves ram is increased to 4096

Change-Id: I0e2dbca1f4d247e2559c38707012c097dcc7d380
Ruslan Khozinov 2 years ago
parent
commit
8b63f5495f
2 changed files with 204 additions and 10 deletions
  1. 7
    10
      plugin_test/test_templates/default.yaml
  2. 197
    0
      plugin_test/test_templates/devops3.yaml

+ 7
- 10
plugin_test/test_templates/default.yaml View File

@@ -44,7 +44,7 @@ template:
44 44
            - storage
45 45
 
46 46
       rack-01-slave-node-params: &rack-01-slave-node-params
47
-        vcpu: !os_env SLAVE_NODE_CPU, 2
47
+        vcpu: !os_env SLAVE_NODE_CPU, 4
48 48
         memory: !os_env SLAVE_NODE_MEMORY, 8192
49 49
         boot:
50 50
           - network
@@ -57,8 +57,8 @@ template:
57 57
         network_config: *rack-01-slave-network_config
58 58
 
59 59
       rack-02-slave-node-params: &rack-02-slave-node-params
60
-        vcpu: !os_env SLAVE_NODE_CPU, 2
61
-        memory: !os_env SLAVE_NODE_MEMORY, 3072
60
+        vcpu: !os_env SLAVE_NODE_CPU, 4
61
+        memory: !os_env SLAVE_NODE_MEMORY, 4096
62 62
         boot:
63 63
           - network
64 64
           - hd
@@ -102,14 +102,11 @@ template:
102 102
          params:
103 103
            connection_string: !os_env CONNECTION_STRING, qemu:///system
104 104
            storage_pool_name: !os_env STORAGE_POOL_NAME, default
105
-           stp: True
106
-           hpet: False
107
-           use_host_cpu: !os_env DRIVER_USE_HOST_CPU, true
108
-
109
-       network_pools:  # Address pools for OpenStack networks.
110
-         # Actual names should be used for keys
111
-         # (the same as in Nailgun, for example)
105
+           stp: !os_env DRIVER_STP, True
106
+           hpet: !os_env DRIVER_HPET, False
107
+           use_host_cpu: !os_env DRIVER_USE_HOST_CPU, True
112 108
 
109
+       network_pools:
113 110
          fuelweb_admin: fuelweb_admin-pool01
114 111
          public: public-pool01
115 112
          storage: storage-pool01

+ 197
- 0
plugin_test/test_templates/devops3.yaml View File

@@ -0,0 +1,197 @@
1
+---
2
+aliases:
3
+  dynamic_address_pool:
4
+    - &pool_default    !os_env POOL_DEFAULT, 10.109.0.0/16:24
5
+
6
+  default_interface_model:
7
+    - &interface_model !os_env INTERFACE_MODEL, e1000
8
+
9
+  interfaces-configuration: &interfaces-configuration
10
+    - label: eth0
11
+      l2_network_device: admin
12
+      interface_model: *interface_model
13
+    - label: eth1
14
+      l2_network_device: public
15
+      interface_model: *interface_model
16
+    - label: eth2
17
+      l2_network_device: storage
18
+      interface_model: *interface_model
19
+    - label: eth3
20
+      l2_network_device: management
21
+      interface_model: *interface_model
22
+    - label: eth4
23
+      l2_network_device: private
24
+      interface_model: *interface_model
25
+
26
+  network_config: &network-configuration
27
+    eth0:
28
+      networks:
29
+       - admin
30
+    eth1:
31
+      networks:
32
+       - public
33
+    eth2:
34
+      networks:
35
+       - storage
36
+    eth3:
37
+      networks:
38
+       - management
39
+    eth4:
40
+      networks:
41
+       - private
42
+
43
+  controller-node-params: &controller-node-params
44
+    vcpu:   !os_env CONTROLLER_NODE_CPU, 4
45
+    memory: !os_env CONTROLLER_NODE_MEMORY, 8192
46
+    boot:
47
+      - network
48
+      - hd
49
+    volumes:
50
+     - name:     system
51
+       format:   qcow2
52
+       capacity: !os_env NODE_VOLUME_SIZE, 150
53
+    interfaces:     *interfaces-configuration
54
+    network_config: *network-configuration
55
+
56
+  slave-node-params: &slave-node-params
57
+    vcpu:   !os_env SLAVE_NODE_CPU, 2
58
+    memory: !os_env SLAVE_NODE_MEMORY, 4096
59
+    boot:
60
+      - network
61
+      - hd
62
+    volumes:
63
+     - name:     system
64
+       format:   qcow2
65
+       capacity: !os_env NODE_VOLUME_SIZE, 150
66
+    interfaces:     *interfaces-configuration
67
+    network_config: *network-configuration
68
+
69
+template:
70
+  devops_settings:
71
+    env_name: !os_env ENV_NAME
72
+
73
+    address_pools:
74
+      admin-pool:
75
+        net: *pool_default
76
+        params:
77
+          vlan_start: 0
78
+          ip_reserved:
79
+            gateway: +1
80
+            l2_network_device: +1
81
+          ip_ranges:
82
+            default: [+2, -2]
83
+
84
+      public-pool:
85
+        net: *pool_default
86
+        params:
87
+          vlan_start: 0
88
+          ip_reserved:
89
+            gateway: +1
90
+            l2_network_device: +1
91
+          ip_ranges:
92
+            default: [+2, +127]
93
+            floating: [+128, -2]
94
+
95
+      storage-pool:
96
+        net: *pool_default
97
+        params:
98
+          vlan_start: 101
99
+
100
+      management-pool:
101
+        net: *pool_default
102
+        params:
103
+          vlan_start: 102
104
+
105
+      private-pool:
106
+        net: *pool_default
107
+        params:
108
+          vlan_start: 1000
109
+          vlan_end:   1030
110
+
111
+    groups:
112
+     - name: nsxt 
113
+       driver:
114
+         name: devops.driver.libvirt
115
+         params:
116
+           connection_string: !os_env CONNECTION_STRING, qemu:///system
117
+           storage_pool_name: !os_env STORAGE_POOL_NAME, default
118
+           use_host_cpu:      !os_env DRIVER_USE_HOST_CPU, True
119
+           enable_acpi:       !os_env DRIVER_ENABLE_ACPI, True
120
+           enable_nwfilters:  !os_env DRIVER_ENABLE_NWFILTERS, False
121
+           stp: True
122
+           hpet: True
123
+
124
+       network_pools:
125
+         admin:      admin-pool
126
+         public:     public-pool
127
+         storage:    storage-pool
128
+         management: management-pool
129
+         private:    private-pool
130
+
131
+       l2_network_devices:
132
+         admin:
133
+           address_pool: admin-pool
134
+           dhcp: false
135
+#          forward:
136
+#            mode: nat
137
+
138
+         public:
139
+           address_pool: public-pool
140
+           dhcp: false
141
+#          forward:
142
+#            mode: nat
143
+
144
+         storage:
145
+           address_pool: storage-pool
146
+           dhcp: false
147
+
148
+         management:
149
+           address_pool: management-pool
150
+           dhcp: false
151
+
152
+         private:
153
+           address_pool: private-pool
154
+           dhcp: false
155
+
156
+       nodes:
157
+        - name: admin
158
+          role: fuel_master
159
+          params:
160
+            vcpu:   !os_env ADMIN_NODE_CPU, 2
161
+            memory: !os_env ADMIN_NODE_MEMORY, 8192
162
+            boot:
163
+              - hd
164
+              - cdrom
165
+            volumes:
166
+             - name: system
167
+               capacity: !os_env ADMIN_NODE_VOLUME_SIZE, 80
168
+               format: qcow2
169
+             - name: iso
170
+               source_image: !os_env ISO_PATH
171
+               format: raw
172
+               device: cdrom
173
+               bus: ide
174
+            interfaces:
175
+             - label: eth0
176
+               l2_network_device: admin
177
+               interface_model: *interface_model
178
+            network_config:
179
+              eth0:
180
+                networks:
181
+                 - admin
182
+
183
+        - name: slave-01
184
+          role: fuel_slave
185
+          params: *controller-node-params
186
+        - name: slave-02
187
+          role: fuel_slave
188
+          params: *controller-node-params
189
+        - name: slave-03
190
+          role: fuel_slave
191
+          params: *controller-node-params
192
+        - name: slave-04
193
+          role: fuel_slave
194
+          params: *slave-node-params
195
+        - name: slave-05
196
+          role: fuel_slave
197
+          params: *slave-node-params

Loading…
Cancel
Save