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

Fix some typos

This commit is contained in:
Joshua Boniface 2018-09-23 15:37:13 -04:00
parent 3c2baf3872
commit 091fc94c05
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
router-daemon/pvcrd.service
View File

@ -7,7 +7,7 @@ After = network-online.target frr.service
Type = simple
WorkingDirectory = /usr/share/pvc
Environment = PYTHONUNBUFFERED=true
Environment = PVCND_CONFIG_FILE=/etc/pvc/pvcrd.conf
Environment = PVCRD_CONFIG_FILE=/etc/pvc/pvcrd.conf
ExecStart = /usr/share/pvc/pvcrd.py
Restart = on-failure

16
router-daemon/pvcrd/VXNetworkInstance.py
View File

@ -89,17 +89,19 @@ class VXNetworkInstance():
self.corosync_provisioned = True
ansiiprint.echo('Creating Corosync resource for gateway {} on interface {}'.format(self.ip_gateway, self.vni), '', 'o')
os.system(
'echo \"
"""
echo "
configure
primitive vnivip_{0} ocf:heartbeat:IPaddr2 params ip={1} cidr_netmask={2} nic={3} op monitor interval=1s
commit
up
resource
start vnivip_{0}
\" | crm -f -'.format(
" | crm -f -
""".format(
self.description,
self.ip_gateway,
self.ip_cidrnetmask
self.ip_cidrnetmask,
self.bridge_nic
)
)
@ -107,14 +109,16 @@ class VXNetworkInstance():
def removeCorosyncResource(self):
ansiiprint.echo('Removing Corosync resource for gateway {} on interface {}'.format(self.ip_gateway, self.vni), '', 'o')
os.system(
'echo \"
"""
echo "
resource
stop vnivip_{0}
up
configure
delete vnivip_{0}
commit
\" | crm -f -'.format(
" | crm -f -
""".format(
self.description
)
)
@ -136,7 +140,7 @@ class VXNetworkInstance():
)
os.system(
'brctl addif {0} {1}'.format(
self.bridge_nic
self.bridge_nic,
self.vxlan_nic
)
)