diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-06-04 11:33:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-06-04 11:33:36 +0000 |
| commit | a4a4c43f92138b7d477c7c944849fc69e3c21ac6 (patch) | |
| tree | a14a06c9697e883a55c423a435d166ed4f47778f /os_net_config/impl_ifcfg.py | |
| parent | 90f15e38f1e4d80b81f4fa1444dde717917ef8ad (diff) | |
| parent | ca30a67a6d56e8f72d23003ffde477e4546a209d (diff) | |
Merge "Don't set OVSDHCPINTERFACES if bridge is static"
Diffstat (limited to 'os_net_config/impl_ifcfg.py')
| -rw-r--r-- | os_net_config/impl_ifcfg.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/os_net_config/impl_ifcfg.py b/os_net_config/impl_ifcfg.py index 33fcb57..40a5ff0 100644 --- a/os_net_config/impl_ifcfg.py +++ b/os_net_config/impl_ifcfg.py @@ -97,7 +97,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" % |