diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-15 16:23:49 +0200 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-16 00:08:16 +0000 |
commit | a4e42550c023bd746143ba323de2bcc61e758bbb (patch) | |
tree | c02bcdac5d5de9d74308a0f4e79b6663047c4f4b /patches/opnfv-fuel/0004-classes-baremetal-AArch64-NIC-adaptation.patch | |
parent | 6e71b19097781a7190bcec015afc62be7961fa43 (diff) |
u/fuel: Bump & rebase for common reclass rework
Change-Id: Id7d125b746e97d6e186a7890a4c2f599e24a186c
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 783585e0379cffbfe0fe242a4daab9f5c4ab1547)
Diffstat (limited to 'patches/opnfv-fuel/0004-classes-baremetal-AArch64-NIC-adaptation.patch')
-rw-r--r-- | patches/opnfv-fuel/0004-classes-baremetal-AArch64-NIC-adaptation.patch | 226 |
1 files changed, 19 insertions, 207 deletions
diff --git a/patches/opnfv-fuel/0004-classes-baremetal-AArch64-NIC-adaptation.patch b/patches/opnfv-fuel/0004-classes-baremetal-AArch64-NIC-adaptation.patch index 6088e764..4882446d 100644 --- a/patches/opnfv-fuel/0004-classes-baremetal-AArch64-NIC-adaptation.patch +++ b/patches/opnfv-fuel/0004-classes-baremetal-AArch64-NIC-adaptation.patch @@ -17,19 +17,15 @@ AArch64 NIC adaptation for dual NIC boards with traffic separation 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(-) + .../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-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: +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} @@ -37,7 +33,7 @@ index c9b3bc1..b8b5208 100644 salt: control: size: # RAM 4096,8192,16384,32768,65536 -@@ -148,6 +149,11 @@ parameters: +@@ -144,6 +145,11 @@ parameters: netmask: 255.255.255.0 name: ${_param:deploy_nic} noifupdown: true @@ -49,7 +45,7 @@ index c9b3bc1..b8b5208 100644 br-mgmt: enabled: true proto: dhcp -@@ -160,9 +166,9 @@ parameters: +@@ -156,9 +162,9 @@ parameters: enabled: true proto: manual type: vlan @@ -61,113 +57,17 @@ index c9b3bc1..b8b5208 100644 br-ctl: enabled: true type: bridge -@@ -170,4 +176,4 @@ parameters: +@@ -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-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: +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} @@ -175,7 +75,7 @@ index e8fc087..13d45f7 100644 interface_mtu: 1500 keepalived_vip_interface: br-ctl keepalived_vip_virtual_router_id: 69 -@@ -71,19 +70,13 @@ parameters: +@@ -60,19 +59,13 @@ parameters: type: eth proto: dhcp name: ${_param:mgmt_nic} @@ -197,95 +97,7 @@ index e8fc087..13d45f7 100644 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: +@@ -80,7 +73,7 @@ parameters: address: ${_param:single_address} netmask: 255.255.255.0 use_interfaces: @@ -294,7 +106,7 @@ index 165e0c9..cad293d 100644 br-floating: enabled: true type: ovs_bridge -@@ -112,6 +105,6 @@ parameters: +@@ -97,6 +90,6 @@ parameters: address: ${_param:external_address} netmask: 255.255.255.0 use_interfaces: |