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
|
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Sun, 6 Aug 2017 20:42:47 +0200
Subject: [PATCH] classes: baremetal: 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>
---
.../baremetal-mcp-ocata-ovs-ha/infra/config.yml | 4 ++--
.../cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml | 18 ++++++++++++------
.../cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml | 8 ++++----
.../baremetal-mcp-ocata-ovs-ha/openstack/compute.yml | 18 +++++++++---------
.../baremetal-mcp-ocata-ovs-ha/openstack/control.yml | 4 ++--
.../baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml | 2 +-
.../baremetal-mcp-ocata-ovs-ha/openstack/database.yml | 4 ++--
.../openstack/message_queue.yml | 4 ++--
.../baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml | 4 ++--
.../baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml | 4 ++--
10 files changed, 38 insertions(+), 32 deletions(-)
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml
index 77443de..824b979 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml
@@ -33,8 +33,8 @@ parameters:
linux:
network:
interface:
- ens3: ${_param:linux_dhcp_interface}
- ens4: ${_param:linux_single_interface}
+ enp1s0: ${_param:linux_dhcp_interface}
+ enp2s0: ${_param:linux_single_interface}
salt:
master:
accept_policy: open_mode
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 1608c65..8677a79 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
@@ -25,7 +25,8 @@ parameters:
cluster_node03_address: ${_param:infra_kvm_node03_address}
keepalived_vip_interface: br-ctl
keepalived_vip_virtual_router_id: 69
- deploy_nic: enp6s0
+ deploy_nic: eth0
+ trunk_nic: eth1
salt:
control:
size: #RAM 4096,8192,16384,32768,65536
@@ -115,7 +116,7 @@ parameters:
linux:
network:
interface:
- eth3:
+ eth0:
enabled: true
type: eth
proto: manual
@@ -123,6 +124,11 @@ parameters:
netmask: 255.255.255.0
name: ${_param:deploy_nic}
noifupdown: true
+ eth1:
+ enabled: true
+ type: eth
+ proto: manual
+ name: ${_param:trunk_nic}
br-mgmt:
enabled: true
proto: dhcp
@@ -133,13 +139,13 @@ parameters:
use_interfaces:
- ${_param:deploy_nic}
noifupdown: true
- vlan300:
+ vlan2183:
enabled: true
proto: manual
type: vlan
- name: ${_param:deploy_nic}.300
+ name: ${_param:trunk_nic}.2183
use_interfaces:
- - ${_param:deploy_nic}
+ - ${_param:trunk_nic}
br-ctl:
enabled: true
type: bridge
@@ -147,4 +153,4 @@ parameters:
address: ${_param:single_address}
netmask: 255.255.255.0
use_interfaces:
- - ${_param:deploy_nic}.300
+ - ${_param:trunk_nic}.2183
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
index d193469..73215ee 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
@@ -4,10 +4,10 @@ classes:
- cluster.baremetal-mcp-ocata-ovs-ha.infra
parameters:
_param:
- dhcp_interface: ens3
- primary_interface: ens4
- pxe_interface: ens5
- external_interface: ens6
+ dhcp_interface: enp1s0
+ primary_interface: enp2s0
+ pxe_interface: enp3s0
+ external_interface: enp4s0
interface_mtu: 1500
# MaaS has issues using MTU > 1500 for PXE interface
pxe_interface_mtu: 1500
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 18a7a0b..d052e23 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
@@ -19,8 +19,8 @@ parameters:
cluster_node03_hostname: ctl03
cluster_node03_address: ${_param:openstack_control_node03_address}
nova_vncproxy_url: https://${_param:cluster_public_host}:6080
- mgmt_nic: enp6s0
- tenant_nic: enp7s0
+ mgmt_nic: eth0
+ tenant_nic: eth1
linux_system_codename: xenial
linux:
network:
@@ -43,19 +43,19 @@ parameters:
netmask: 255.255.255.0
mtu: 1500
use_interfaces:
- - ${_param:tenant_nic}.302
- vlan300:
+ - ${_param:tenant_nic}.2185
+ vlan2183:
enabled: true
proto: manual
type: vlan
- name: ${_param:mgmt_nic}.300
+ name: ${_param:tenant_nic}.2183
use_interfaces:
- - ${_param:mgmt_nic}
- vlan302:
+ - ${_param:tenant_nic}
+ vlan2185:
enabled: true
proto: manual
type: vlan
- name: ${_param:tenant_nic}.302
+ name: ${_param:tenant_nic}.2185
use_interfaces:
- ${_param:tenant_nic}
br-ctl:
@@ -65,4 +65,4 @@ parameters:
address: ${_param:single_address}
netmask: 255.255.255.0
use_interfaces:
- - ${_param:mgmt_nic}.300
+ - ${_param:tenant_nic}.2183
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml
index 995c50c..97f44ca 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml
@@ -23,7 +23,7 @@ classes:
- cluster.baremetal-mcp-ocata-ovs-ha.infra
parameters:
_param:
- keepalived_vip_interface: ens3
+ keepalived_vip_interface: enp1s0
keepalived_vip_virtual_router_id: 50
cluster_vip_address: ${_param:openstack_control_address}
cluster_local_address: ${_param:single_address}
@@ -37,7 +37,7 @@ parameters:
linux:
network:
interface:
- ens3: ${_param:linux_single_interface}
+ enp1s0: ${_param:linux_single_interface}
bind:
server:
control:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml
index b7ed814..bfca091 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml
@@ -7,4 +7,4 @@ parameters:
linux:
network:
interface:
- ens3: ${_param:linux_single_interface}
+ enp1s0: ${_param:linux_single_interface}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml
index c0e21aa..3fcf34b 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml
@@ -16,7 +16,7 @@ classes:
- cluster.baremetal-mcp-ocata-ovs-ha
parameters:
_param:
- keepalived_vip_interface: ens3
+ keepalived_vip_interface: enp1s0
keepalived_vip_virtual_router_id: 80
galera_server_cluster_name: openstack_cluster
cluster_vip_address: ${_param:openstack_database_address}
@@ -30,4 +30,4 @@ parameters:
linux:
network:
interface:
- ens3: ${_param:linux_single_interface}
+ enp1s0: ${_param:linux_single_interface}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml
index 3b79030..4910196 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml
@@ -7,7 +7,7 @@ classes:
- cluster.baremetal-mcp-ocata-ovs-ha
parameters:
_param:
- keepalived_vip_interface: ens3
+ keepalived_vip_interface: enp1s0
keepalived_vip_virtual_router_id: 90
cluster_vip_address: ${_param:openstack_message_queue_address}
cluster_local_address: ${_param:single_address}
@@ -20,4 +20,4 @@ parameters:
linux:
network:
interface:
- ens3: ${_param:linux_single_interface}
+ enp1s0: ${_param:linux_single_interface}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml
index 2695c96..d146d8a 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml
@@ -15,7 +15,7 @@ classes:
# - cluster.baremetal-mcp-ocata-ovs-ha.stacklight.proxy
parameters:
_param:
- keepalived_vip_interface: ens3
+ keepalived_vip_interface: enp1s0
keepalived_vip_virtual_router_id: 240
nginx_proxy_ssl:
enabled: true
@@ -27,7 +27,7 @@ parameters:
linux:
network:
interface:
- ens3: ${_param:linux_single_interface}
+ enp1s0: ${_param:linux_single_interface}
system:
package:
libapache2-mod-wsgi:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml
index ca655dd..69ca07f 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml
@@ -10,7 +10,7 @@ classes:
- cluster.baremetal-mcp-ocata-ovs-ha.infra
parameters:
_param:
- keepalived_vip_interface: ens3
+ keepalived_vip_interface: enp1s0
keepalived_vip_virtual_router_id: 230
cluster_vip_address: ${_param:openstack_telemetry_address}
cluster_local_address: ${_param:single_address}
@@ -23,4 +23,4 @@ parameters:
linux:
network:
interface:
- ens3: ${_param:linux_single_interface}
+ enp1s0: ${_param:linux_single_interface}
|
