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
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
|
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Tue, 25 Jul 2017 02:53:16 +0200
Subject: [PATCH] classes: virtual: AArch64: virtio NIC names sync
grep -e "ens[[:digit:]]" -R . -l | \
xargs sed -i \
-e 's/ens3/enp1s0/g' \
-e 's/ens4/enp2s0/g' \
-e 's/ens5/enp3s0/g' \
-e 's/ens6/enp4s0/g'
Since AArch64 will be using virtio-net-pci NIC model for guests,
predictable interface naming yields a slightly different scheme.
Update all configuration to reflect this.
NOTE: Above configuration is expected with libvirt 3.x, which puts
each NIC on a separate PCIe bus (which also imposes virtio modern
is used).
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
.../classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml | 2 +-
.../cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml | 2 +-
.../cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml | 8 ++++----
.../cluster/virtual-mcp-ocata-odl-router/openstack/control.yml | 4 ++--
.../cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml | 8 ++++----
.../classes/cluster/virtual-mcp-ocata-odl/infra/config.yml | 2 +-
.../cluster/virtual-mcp-ocata-odl/opendaylight/control.yml | 2 +-
.../classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml | 8 ++++----
.../classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml | 4 ++--
.../classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml | 8 ++++----
.../classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml | 6 +++---
.../cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml | 8 ++++----
.../cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml | 4 ++--
.../cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml | 8 ++++----
.../classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml | 2 +-
.../classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml | 8 ++++----
.../classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml | 4 ++--
.../classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml | 8 ++++----
18 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml
index 63e58a2..2f8e94a 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml
@@ -27,7 +27,7 @@ parameters:
linux:
network:
interface:
- ens4:
+ enp2s0:
enabled: true
type: eth
proto: static
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml
index 6e37978..e9e6056 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml
@@ -11,7 +11,7 @@ parameters:
linux:
network:
interface:
- ens4:
+ enp2s0:
enabled: true
type: eth
proto: static
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml
index ba710a3..0c1a91f 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml
@@ -10,9 +10,9 @@ classes:
- cluster.virtual-mcp-ocata-odl-router
parameters:
_param:
- primary_interface: ens4
- tenant_interface: ens5
- external_interface: ens6
+ primary_interface: enp2s0
+ tenant_interface: enp3s0
+ external_interface: enp4s0
interface_mtu: 9000
linux_system_codename: xenial
loopback_device_size: 10
@@ -54,7 +54,7 @@ parameters:
interface:
dhcp_int:
enabled: true
- name: ens3
+ name: enp1s0
proto: dhcp
type: eth
mtu: ${_param:interface_mtu}
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml
index 4d31b09..1ea653a 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml
@@ -40,13 +40,13 @@ parameters:
version: latest
network:
interface:
- ens4:
+ enp2s0:
enabled: true
type: eth
proto: static
address: ${_param:single_address}
netmask: 255.255.255.0
- ens6:
+ enp4s0:
enabled: true
type: eth
proto: static
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml
index fee8097..f6173d0 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml
@@ -6,9 +6,9 @@ classes:
- cluster.virtual-mcp-ocata-odl-router
parameters:
_param:
- primary_interface: ens4
- tenant_interface: ens5
- external_interface: ens6
+ primary_interface: enp2s0
+ tenant_interface: enp3s0
+ external_interface: enp4s0
interface_mtu: 9000
linux_system_codename: xenial
neutron_agents:
@@ -33,7 +33,7 @@ parameters:
interface:
dhcp_int:
enabled: true
- name: ens3
+ name: enp1s0
proto: dhcp
type: eth
mtu: ${_param:interface_mtu}
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml
index 328d6df..57c6cec 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml
@@ -27,7 +27,7 @@ parameters:
linux:
network:
interface:
- ens4:
+ enp2s0:
enabled: true
type: eth
proto: static
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml
index 38431a5..066488b 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml
@@ -10,7 +10,7 @@ parameters:
linux:
network:
interface:
- ens4:
+ enp2s0:
enabled: true
type: eth
proto: static
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml
index 97eda6c..3f18ccd 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml
@@ -10,9 +10,9 @@ classes:
- cluster.virtual-mcp-ocata-odl
parameters:
_param:
- primary_interface: ens4
- tenant_interface: ens5
- external_interface: ens6
+ primary_interface: enp2s0
+ tenant_interface: enp3s0
+ external_interface: enp4s0
interface_mtu: 9000
linux_system_codename: xenial
loopback_device_size: 10
@@ -52,7 +52,7 @@ parameters:
interface:
dhcp_int:
enabled: true
- name: ens3
+ name: enp1s0
proto: dhcp
type: eth
mtu: ${_param:interface_mtu}
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml
index 17c22c5..ca3a812 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml
@@ -40,13 +40,13 @@ parameters:
version: latest
network:
interface:
- ens4:
+ enp2s0:
enabled: true
type: eth
proto: static
address: ${_param:single_address}
netmask: 255.255.255.0
- ens6:
+ enp4s0:
enabled: true
type: eth
proto: static
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml
index e8421ca..657ddd3 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml
@@ -6,9 +6,9 @@ classes:
- cluster.virtual-mcp-ocata-odl
parameters:
_param:
- primary_interface: ens4
- tenant_interface: ens5
- external_interface: ens6
+ primary_interface: enp2s0
+ tenant_interface: enp3s0
+ external_interface: enp4s0
interface_mtu: 9000
linux_system_codename: xenial
neutron_agents:
@@ -32,7 +32,7 @@ parameters:
interface:
dhcp_int:
enabled: true
- name: ens3
+ name: enp1s0
proto: dhcp
type: eth
mtu: ${_param:interface_mtu}
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml
index 864c71d..aec6cde 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml
@@ -26,7 +26,7 @@ parameters:
linux:
network:
interface:
- ens4:
+ enp2s0:
enabled: true
type: eth
proto: static
@@ -51,14 +51,14 @@ parameters:
single_address: 172.16.10.105
tenant_address: 10.1.0.105
external_address: 10.16.0.105
- dpdk0_name: ens5
+ dpdk0_name: enp3s0
dpdk0_pci: '"0000:00:05.0"'
openstack_compute_node02:
params:
single_address: 172.16.10.106
tenant_address: 10.1.0.106
external_address: 10.16.0.106
- dpdk0_name: ens5
+ dpdk0_name: enp3s0
dpdk0_pci: '"0000:00:05.0"'
openstack_gateway_node01:
params:
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml
index c23ca7f..6d2f724 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml
@@ -12,9 +12,9 @@ classes:
- cluster.virtual-mcp-ocata-ovs-dpdk
parameters:
_param:
- primary_interface: ens4
- tenant_interface: ens5
- external_interface: ens6
+ primary_interface: enp2s0
+ tenant_interface: enp3s0
+ external_interface: enp4s0
interface_mtu: 9000
linux_system_codename: xenial
loopback_device_size: 10
@@ -51,7 +51,7 @@ parameters:
interface:
dhcp_int:
enabled: true
- name: ens3
+ name: enp1s0
proto: dhcp
type: eth
mtu: ${_param:interface_mtu}
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml
index b85f085..20eb8f5 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml
@@ -40,13 +40,13 @@ parameters:
version: latest
network:
interface:
- ens4:
+ enp2s0:
enabled: true
type: eth
proto: static
address: ${_param:single_address}
netmask: 255.255.255.0
- ens6:
+ enp4s0:
enabled: true
type: eth
proto: static
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml
index e102c10..f153a19 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml
@@ -6,9 +6,9 @@ classes:
- cluster.virtual-mcp-ocata-ovs-dpdk
parameters:
_param:
- primary_interface: ens4
- tenant_interface: ens5
- external_interface: ens6
+ primary_interface: enp2s0
+ tenant_interface: enp3s0
+ external_interface: enp4s0
interface_mtu: 9000
linux_system_codename: xenial
neutron:
@@ -22,7 +22,7 @@ parameters:
interface:
dhcp_int:
enabled: true
- name: ens3
+ name: enp1s0
proto: dhcp
type: eth
mtu: ${_param:interface_mtu}
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
index 97730b1..8cb0992 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
@@ -26,7 +26,7 @@ parameters:
linux:
network:
interface:
- ens4:
+ enp2s0:
enabled: true
type: eth
proto: static
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml
index a86a7c6..0469fa0 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml
@@ -10,9 +10,9 @@ classes:
- cluster.virtual-mcp-ocata-ovs
parameters:
_param:
- primary_interface: ens4
- tenant_interface: ens5
- external_interface: ens6
+ primary_interface: enp2s0
+ tenant_interface: enp3s0
+ external_interface: enp4s0
interface_mtu: 9000
linux_system_codename: xenial
loopback_device_size: 10
@@ -47,7 +47,7 @@ parameters:
interface:
dhcp_int:
enabled: true
- name: ens3
+ name: enp1s0
proto: dhcp
type: eth
mtu: ${_param:interface_mtu}
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml
index ae103cd..350b618 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml
@@ -40,13 +40,13 @@ parameters:
version: latest
network:
interface:
- ens4:
+ enp2s0:
enabled: true
type: eth
proto: static
address: ${_param:single_address}
netmask: 255.255.255.0
- ens6:
+ enp4s0:
enabled: true
type: eth
proto: static
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml
index 9257d86..26b0e4c 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml
@@ -6,9 +6,9 @@ classes:
- cluster.virtual-mcp-ocata-ovs
parameters:
_param:
- primary_interface: ens4
- tenant_interface: ens5
- external_interface: ens6
+ primary_interface: enp2s0
+ tenant_interface: enp3s0
+ external_interface: enp4s0
interface_mtu: 9000
linux_system_codename: xenial
neutron:
@@ -20,7 +20,7 @@ parameters:
interface:
dhcp_int:
enabled: true
- name: ens3
+ name: enp1s0
proto: dhcp
type: eth
mtu: ${_param:interface_mtu}
|
