cloud-init/backport-fix-openstack-Fix-bond-mac_address-5369.patch
dongyuzhen 3b2547ae8f backport upstream bugfix patches
(cherry picked from commit 8bacb2e291d56eecd120db9fdfa363087949d273)
2024-09-06 08:17:06 +08:00

30 lines
1.1 KiB
Diff

From 12f1198e8e9e884363b14eeaaf6eb69b7199c36a Mon Sep 17 00:00:00 2001
From: Curt Moore <curt.moore@garmin.com>
Date: Tue, 4 Jun 2024 14:37:43 -0500
Subject: [PATCH] fix(openstack): Fix bond mac_address (#5369)
Reference:https://github.com/canonical/cloud-init/commit/12f1198e8e9e884363b14eeaaf6eb69b7199c36a
Conflict:tools/.github-cla-signers not change.
Fixes GH-5368
---
cloudinit/sources/helpers/openstack.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cloudinit/sources/helpers/openstack.py b/cloudinit/sources/helpers/openstack.py
index 4f566e6..bd5714f 100644
--- a/cloudinit/sources/helpers/openstack.py
+++ b/cloudinit/sources/helpers/openstack.py
@@ -632,7 +632,7 @@ def convert_net_json(network_json=None, known_macs=None):
if link['type'] in ['bond']:
params = {}
if link_mac_addr:
- params['mac_address'] = link_mac_addr
+ cfg.update({"mac_address": link_mac_addr})
for k, v in link.items():
if k == 'bond_links':
continue
--
2.43.0