aboutsummaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0004-classes-baremetal-AArch64-NIC-adaptation.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-17 16:06:14 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-18 15:42:49 +0200
commite68b725920bd313df0ca65a77b27c8de6a6e2937 (patch)
tree00918488e6d85e14ffdc6452f6ad1b73db9b079a /patches/opnfv-fuel/0004-classes-baremetal-AArch64-NIC-adaptation.patch
parentd4dd2e997a4af3ed0dfc74dfb964e07ed7225d05 (diff)
u/fuel: Bump & rebase for state break & retry
While at it, return true for all armband states that apply patches which are also providing a post-patching file hash. Change-Id: I303a2e142a8a9925f6630b53891ddc7bb0399453 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
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.patch8
1 files changed, 4 insertions, 4 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 4882446d..c58585e0 100644
--- a/patches/opnfv-fuel/0004-classes-baremetal-AArch64-NIC-adaptation.patch
+++ b/patches/opnfv-fuel/0004-classes-baremetal-AArch64-NIC-adaptation.patch
@@ -64,7 +64,7 @@ index ce81f42..b270e0f 100644
- - ${_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
+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:
@@ -75,7 +75,7 @@ index aca416e..07561cd 100644
interface_mtu: 1500
keepalived_vip_interface: br-ctl
keepalived_vip_virtual_router_id: 69
-@@ -60,19 +59,13 @@ parameters:
+@@ -58,19 +57,13 @@ parameters:
type: eth
proto: dhcp
name: ${_param:mgmt_nic}
@@ -97,7 +97,7 @@ index aca416e..07561cd 100644
br-ctl:
enabled: true
type: bridge
-@@ -80,7 +73,7 @@ parameters:
+@@ -78,7 +71,7 @@ parameters:
address: ${_param:single_address}
netmask: 255.255.255.0
use_interfaces:
@@ -106,7 +106,7 @@ index aca416e..07561cd 100644
br-floating:
enabled: true
type: ovs_bridge
-@@ -97,6 +90,6 @@ parameters:
+@@ -95,6 +88,6 @@ parameters:
address: ${_param:external_address}
netmask: 255.255.255.0
use_interfaces: