From cdbb329e8e1f65ae514f058ac4259c580833c30e Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Fri, 18 Aug 2017 17:19:13 +0200 Subject: p/fuel: Rebase after salt control image update Change-Id: I362ae48d576b14c87188e88599e0a0542028dcb2 Signed-off-by: Alexandru Avadanii --- .../0009-classes-baremetal-AArch64-virtio-NIC-names-sync.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'patches/opnfv-fuel/0009-classes-baremetal-AArch64-virtio-NIC-names-sync.patch') diff --git a/patches/opnfv-fuel/0009-classes-baremetal-AArch64-virtio-NIC-names-sync.patch b/patches/opnfv-fuel/0009-classes-baremetal-AArch64-virtio-NIC-names-sync.patch index ccd537aa..4e3e1085 100644 --- a/patches/opnfv-fuel/0009-classes-baremetal-AArch64-virtio-NIC-names-sync.patch +++ b/patches/opnfv-fuel/0009-classes-baremetal-AArch64-virtio-NIC-names-sync.patch @@ -106,7 +106,7 @@ index 5c33f9e..8b09e76 100644 - - ${_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 7fc45e2..428a74b 100644 +index a7a502f..694fae7 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: -- cgit 1.2.3-korg