Ido Barkan has uploaded a new change for review. Change subject: net: ignore bondingOptions in persistent networks. ......................................................................
net: ignore bondingOptions in persistent networks. Up until https://gerrit.ovirt.org/#/c/42146/ bondingOptions were mistakenly part of persistent network attributes. So, if we are upgrading from an older enough version, we should drop this entry it the copied persistent networks. Change-Id: I1c29d4e6c109d4fa7b2d293133b8551e423ec139 Signed-off-by: Ido Barkan <ibar...@redhat.com> --- M lib/vdsm/netconfpersistence.py 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/38/43238/1 diff --git a/lib/vdsm/netconfpersistence.py b/lib/vdsm/netconfpersistence.py index b8de93d..b5efff8 100644 --- a/lib/vdsm/netconfpersistence.py +++ b/lib/vdsm/netconfpersistence.py @@ -363,6 +363,11 @@ bond_attr.get('options')) bond_attr['options'] = self._netinfo.bondOptsForIfcfg( normalized_opts) + # before d18e2f10 bondingOptions were also part of networks, so in case + # we are upgrading from an older version, they should be ignored if + # they exist. + for net_attr in config_copy.networks.itervalues(): + net_attr.pop('bondingOptions', None) def _normalize_bonding_nics(self, config_copy): for bond_attr in config_copy.bonds.itervalues(): -- To view, visit https://gerrit.ovirt.org/43238 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1c29d4e6c109d4fa7b2d293133b8551e423ec139 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Ido Barkan <ibar...@redhat.com> _______________________________________________ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
