From 9ab869c0eb50fde3d8ccdf20bdd86c68995f59db Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Thu, 19 Oct 2017 01:15:15 +0200 Subject: u/fuel: Bump & rebase for PDF-based network config Change-Id: If970bbc8735d38542a90b2cbdbb2523ae644a29c Signed-off-by: Alexandru Avadanii (cherry picked from commit 7bcfc857535346a72708b1166759e8480e676a38) --- ...-classes-baremetal-AArch64-NIC-adaptation.patch | 116 --------------------- 1 file changed, 116 deletions(-) delete mode 100644 patches/opnfv-fuel/0004-classes-baremetal-AArch64-NIC-adaptation.patch (limited to 'patches/opnfv-fuel/0004-classes-baremetal-AArch64-NIC-adaptation.patch') diff --git a/patches/opnfv-fuel/0004-classes-baremetal-AArch64-NIC-adaptation.patch b/patches/opnfv-fuel/0004-classes-baremetal-AArch64-NIC-adaptation.patch deleted file mode 100644 index c58585e0..00000000 --- a/patches/opnfv-fuel/0004-classes-baremetal-AArch64-NIC-adaptation.patch +++ /dev/null @@ -1,116 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: 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 -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 ---- - .../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 1540133..d370496 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 -@@ -58,19 +57,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 -@@ -78,7 +71,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 -@@ -95,6 +88,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 -- cgit 1.2.3-korg