From ca30a67a6d56e8f72d23003ffde477e4546a209d Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Thu, 14 May 2015 15:18:26 -0400 Subject: Don't set OVSDHCPINTERFACES if bridge is static Updates the ifcfg provider so that we don't set the OVSDHCPINTERFACES config setting if the interface is private. This doesn't seem to cause any functional issues but it is not required and can be confusing. Change-Id: I9d51905df87969ae1b221680e8f0b5befc7b6bfe --- os_net_config/impl_ifcfg.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'os_net_config/impl_ifcfg.py') diff --git a/os_net_config/impl_ifcfg.py b/os_net_config/impl_ifcfg.py index 097552a..2411951 100644 --- a/os_net_config/impl_ifcfg.py +++ b/os_net_config/impl_ifcfg.py @@ -95,7 +95,8 @@ class IfcfgNetConfig(os_net_config.NetConfig): if base_opt.members: members = [member.name for member in base_opt.members] self.member_names[base_opt.name] = members - data += ("OVSDHCPINTERFACES=\"%s\"\n" % " ".join(members)) + if base_opt.use_dhcp: + data += ("OVSDHCPINTERFACES=\"%s\"\n" % " ".join(members)) if base_opt.primary_interface_name: mac = utils.interface_mac(base_opt.primary_interface_name) ovs_extra.append("set bridge %s other-config:hwaddr=%s" % -- cgit 1.2.3-korg