parallelvirtualcluster
/
pvc
1
0
Fork 0
Code Issues 11 Pull Requests Projects Releases 112 Wiki Activity

Use vmbr name for Bridge interfaces

This commit is contained in:
Joshua Boniface 2019-03-17 00:19:01 -04:00
parent 15c832650d
commit 12bc3acf85
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
node-daemon/pvcd/VXNetworkInstance.py
View File

@ -68,7 +68,7 @@ class VXNetworkInstance(object):
self.description = None self.description = None
self.vlan_nic = 'vlan{}'.format(self.vni) self.vlan_nic = 'vlan{}'.format(self.vni)
self.bridge_nic = 'br{}'.format(self.vni) self.bridge_nic = 'vmbr{}'.format(self.vni)
# Zookeper handlers for changed states # Zookeper handlers for changed states
@self.zk_conn.DataWatch('/networks/{}'.format(self.vni)) @self.zk_conn.DataWatch('/networks/{}'.format(self.vni))
@ -101,7 +101,7 @@ class VXNetworkInstance(object):
self.dhcp4_end = ( zkhandler.readdata(self.zk_conn, '/networks/{}/dhcp4_end'.format(self.vni)) == 'True' ) self.dhcp4_end = ( zkhandler.readdata(self.zk_conn, '/networks/{}/dhcp4_end'.format(self.vni)) == 'True' )
self.vxlan_nic = 'vxlan{}'.format(self.vni) self.vxlan_nic = 'vxlan{}'.format(self.vni)
self.bridge_nic = 'br{}'.format(self.vni) self.bridge_nic = 'vmbr{}'.format(self.vni)
self.nftables_netconf_filename = '{}/networks/{}.nft'.format(self.config['nft_dynamic_directory'], self.vni) self.nftables_netconf_filename = '{}/networks/{}.nft'.format(self.config['nft_dynamic_directory'], self.vni)
self.firewall_rules = [] self.firewall_rules = []