aboutsummaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0004-classes-baremetal-AArch64-NIC-adaptation.patch
blob: 6088e76473f1da35e7b09592b4e90efb75bcacca (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
: Copyright (c) 2017 Enea AB and others.
:
: All rights reserved. This program and the accompanying materials
: are made available under the terms of the Apache License, Version 2.0
: which accompanies this distribution, and is available at
: http://www.apache.org/licenses/LICENSE-2.0
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
From: Guillermo Herrero <guillermo.herrero@enea.com>
Date: Mon, 9 Oct 2017 14:28:15 +0200
Subject: [PATCH] classes: baremetal: AArch64: NIC adaptation

AArch64 NIC adaptation for dual NIC boards with traffic separation
 -kvm nodes: added second trunk_nic
 -compute nodes: removed third external_nic

Change-Id: Iae73670c7ec6080f420cf61e5f0a79f8424665c9
Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
---
 .../cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml      | 12 +++++++++---
 .../baremetal-mcp-ocata-odl-ha/openstack/compute.yml      | 15 ++++-----------
 .../cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml | 12 +++++++++---
 .../baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml | 13 +++----------
 .../cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml      | 12 +++++++++---
 .../baremetal-mcp-ocata-ovs-ha/openstack/compute.yml      | 15 ++++-----------
 6 files changed, 38 insertions(+), 41 deletions(-)

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
index c9b3bc1..b8b5208 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
@@ -26,6 +26,7 @@ parameters:
     keepalived_vip_interface: br-ctl
     keepalived_vip_virtual_router_id: 69
     deploy_nic: ${_param:opnfv_baremetal_primary_nic}
+    trunk_nic: ${_param:opnfv_baremetal_secondary_nic}
   salt:
     control:
       size:  # RAM 4096,8192,16384,32768,65536
@@ -148,6 +149,11 @@ parameters:
           netmask: 255.255.255.0
           name: ${_param:deploy_nic}
           noifupdown: true
+        trunk:
+          enabled: true
+          type: eth
+          proto: manual
+          name: ${_param:trunk_nic}
         br-mgmt:
           enabled: true
           proto: dhcp
@@ -160,9 +166,9 @@ parameters:
           enabled: true
           proto: manual
           type: vlan
-          name: ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan}
+          name: ${_param:trunk_nic}.${_param:opnfv_net_mgmt_vlan}
           use_interfaces:
-            - ${_param:deploy_nic}
+            - ${_param:trunk_nic}
         br-ctl:
           enabled: true
           type: bridge
@@ -170,4 +176,4 @@ parameters:
           address: ${_param:single_address}
           netmask: 255.255.255.0
           use_interfaces:
-            - ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan}
+            - ${_param:trunk_nic}.${_param:opnfv_net_mgmt_vlan}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
index 032dd84..e898353 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
@@ -26,7 +26,6 @@ parameters:
     nova_vncproxy_url: https://${_param:cluster_public_host}:6080
     mgmt_nic: ${_param:opnfv_baremetal_primary_nic}
     tenant_nic: ${_param:opnfv_baremetal_secondary_nic}
-    external_nic: ${_param:opnfv_baremetal_tertiary_nic}
     interface_mtu: 1500
     keepalived_vip_interface: br-ctl
     keepalived_vip_virtual_router_id: 69
@@ -77,12 +76,6 @@ parameters:
           type: eth
           proto: manual
           name: ${_param:tenant_nic}
-        external_nic:
-          enabled: true
-          name: ${_param:external_nic}
-          mtu: ${_param:interface_mtu}
-          proto: manual
-          type: eth
         br-mesh:
           enabled: true
           type: bridge
@@ -95,9 +88,9 @@ parameters:
           enabled: true
           proto: manual
           type: vlan
-          name: ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan}
+          name: ${_param:tenant_nic}.${_param:opnfv_net_mgmt_vlan}
           use_interfaces:
-            - ${_param:mgmt_nic}
+            - ${_param:tenant_nic}
         tenant-vlan:
           enabled: true
           proto: manual
@@ -112,7 +105,7 @@ parameters:
           address: ${_param:single_address}
           netmask: 255.255.255.0
           use_interfaces:
-            - ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan}
+            - ${_param:tenant_nic}.${_param:opnfv_net_mgmt_vlan}
         br-floating:
           enabled: true
           type: ovs_bridge
@@ -129,6 +122,6 @@ parameters:
           address: ${_param:external_address}
           netmask: 255.255.255.0
           use_interfaces:
-            - ${_param:external_nic}
+            - ${_param:tenant_nic}
           use_ovs_ports:
             - float-to-ex
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml
index d5f2e92..725c2c0 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml
@@ -26,6 +26,7 @@ parameters:
     keepalived_vip_interface: br-ctl
     keepalived_vip_virtual_router_id: 69
     deploy_nic: ${_param:opnfv_baremetal_primary_nic}
+    trunk_nic: ${_param:opnfv_baremetal_secondary_nic}
   salt:
     control:
       size:  # RAM 4096,8192,16384,32768,65536
@@ -137,6 +138,11 @@ parameters:
           netmask: 255.255.255.0
           name: ${_param:deploy_nic}
           noifupdown: true
+        trunk:
+          enabled: true
+          type: eth
+          proto: manual
+          name: ${_param:trunk_nic}
         br-mgmt:
           enabled: true
           proto: dhcp
@@ -149,9 +155,9 @@ parameters:
           enabled: true
           proto: manual
           type: vlan
-          name: ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan}
+          name: ${_param:trunk_nic}.${_param:opnfv_net_mgmt_vlan}
           use_interfaces:
-            - ${_param:deploy_nic}
+            - ${_param:trunk_nic}
         br-ctl:
           enabled: true
           type: bridge
@@ -159,4 +165,4 @@ parameters:
           address: ${_param:single_address}
           netmask: 255.255.255.0
           use_interfaces:
-            - ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan}
+            - ${_param:trunk_nic}.${_param:opnfv_net_mgmt_vlan}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml
index e8fc087..13d45f7 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml
@@ -25,7 +25,6 @@ parameters:
     cluster_node03_address: ${_param:openstack_control_node03_address}
     nova_vncproxy_url: https://${_param:cluster_public_host}:6080
     mgmt_nic: ${_param:opnfv_baremetal_primary_nic}
-    external_nic: ${_param:opnfv_baremetal_tertiary_nic}
     interface_mtu: 1500
     keepalived_vip_interface: br-ctl
     keepalived_vip_virtual_router_id: 69
@@ -71,19 +70,13 @@ parameters:
           type: eth
           proto: dhcp
           name: ${_param:mgmt_nic}
-        external_nic:
-          enabled: true
-          name: ${_param:external_nic}
-          mtu: ${_param:interface_mtu}
-          proto: manual
-          type: eth
         mgmt-vlan:
           enabled: true
           proto: manual
           type: vlan
-          name: ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan}
+          name: ${_param:tenant_nic}.${_param:opnfv_net_mgmt_vlan}
           use_interfaces:
-            - ${_param:mgmt_nic}
+            - ${_param:tenant_nic}
         br-ctl:
           enabled: true
           type: bridge
@@ -91,7 +84,7 @@ parameters:
           address: ${_param:single_address}
           netmask: 255.255.255.0
           use_interfaces:
-            - ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan}
+            - ${_param:tenant_nic}.${_param:opnfv_net_mgmt_vlan}
         br-floating:
           enabled: true
           type: ovs_bridge
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
index eb73e1c..730de08 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
@@ -26,6 +26,7 @@ parameters:
     keepalived_vip_interface: br-ctl
     keepalived_vip_virtual_router_id: 69
     deploy_nic: ${_param:opnfv_baremetal_primary_nic}
+    trunk_nic: ${_param:opnfv_baremetal_secondary_nic}
   salt:
     control:
       size:  # RAM 4096,8192,16384,32768,65536
@@ -138,6 +139,11 @@ parameters:
           netmask: 255.255.255.0
           name: ${_param:deploy_nic}
           noifupdown: true
+        trunk:
+          enabled: true
+          type: eth
+          proto: manual
+          name: ${_param:trunk_nic}
         br-mgmt:
           enabled: true
           proto: dhcp
@@ -150,9 +156,9 @@ parameters:
           enabled: true
           proto: manual
           type: vlan
-          name: ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan}
+          name: ${_param:trunk_nic}.${_param:opnfv_net_mgmt_vlan}
           use_interfaces:
-            - ${_param:deploy_nic}
+            - ${_param:trunk_nic}
         br-ctl:
           enabled: true
           type: bridge
@@ -160,4 +166,4 @@ parameters:
           address: ${_param:single_address}
           netmask: 255.255.255.0
           use_interfaces:
-            - ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan}
+            - ${_param:trunk_nic}.${_param:opnfv_net_mgmt_vlan}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml
index 165e0c9..cad293d 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml
@@ -25,7 +25,6 @@ parameters:
     nova_vncproxy_url: https://${_param:cluster_public_host}:6080
     mgmt_nic: ${_param:opnfv_baremetal_primary_nic}
     tenant_nic: ${_param:opnfv_baremetal_secondary_nic}
-    external_nic: ${_param:opnfv_baremetal_tertiary_nic}
     linux_system_codename: xenial
     interface_mtu: 1500
     keepalived_vip_interface: br-ctl
@@ -60,12 +59,6 @@ parameters:
           type: eth
           proto: manual
           name: ${_param:tenant_nic}
-        external_nic:
-          enabled: true
-          name: ${_param:external_nic}
-          mtu: ${_param:interface_mtu}
-          proto: manual
-          type: eth
         br-mesh:
           enabled: true
           type: bridge
@@ -78,9 +71,9 @@ parameters:
           enabled: true
           proto: manual
           type: vlan
-          name: ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan}
+          name: ${_param:tenant_nic}.${_param:opnfv_net_mgmt_vlan}
           use_interfaces:
-            - ${_param:mgmt_nic}
+            - ${_param:tenant_nic}
         tenant-vlan:
           enabled: true
           proto: manual
@@ -95,7 +88,7 @@ parameters:
           address: ${_param:single_address}
           netmask: 255.255.255.0
           use_interfaces:
-            - ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan}
+            - ${_param:tenant_nic}.${_param:opnfv_net_mgmt_vlan}
         br-floating:
           enabled: true
           type: ovs_bridge
@@ -112,6 +105,6 @@ parameters:
           address: ${_param:external_address}
           netmask: 255.255.255.0
           use_interfaces:
-            - ${_param:external_nic}
+            - ${_param:tenant_nic}
           use_ovs_ports:
             - float-to-ex