aboutsummaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0004-classes-baremetal-AArch64-NIC-adaptation.patch
blob: 4882446d4bd8f6dcd321e7fa6500afc982e5fd43 (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
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
: 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-common/infra/kvm.yml      | 12 +++++++++---
 .../baremetal-mcp-ocata-common/openstack_compute.yml      | 15 ++++-----------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml
index ce81f42..b270e0f 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml
@@ -32,6 +32,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
@@ -144,6 +145,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
@@ -156,9 +162,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
@@ -166,4 +172,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-common/openstack_compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml
index aca416e..07561cd 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml
@@ -30,7 +30,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
@@ -60,19 +59,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
@@ -80,7 +73,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
@@ -97,6 +90,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