apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge release branch 4.19 to 4.20

Browse Source 
* 4.19:
  VR: fix site-2-site VPN if split connections is enabled (#10067)
  UI: fix cannot open 'Edit tags' modal for static routes (#10065)
This commit is contained in:
Daan Hoogland 2024-12-30 13:07:56 +01:00
commit 41c27e116c
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
systemvm/debian/opt/cloud/bin/configure.py
View File

@ -1100,7 +1100,7 @@ class CsSite2SiteVpn(CsDataBag):
file.addeq(" dpddelay=30") file.addeq(" dpddelay=30")
file.addeq(" dpdtimeout=120") file.addeq(" dpdtimeout=120")
file.addeq(" dpdaction=restart") file.addeq(" dpdaction=restart")
if splitconnections and peerlistarr.count > 1: if splitconnections and len(peerlistarr) > 1:
logging.debug('Splitting connections for rightsubnets %s' % peerlistarr) logging.debug('Splitting connections for rightsubnets %s' % peerlistarr)
for peeridx in range(1, len(peerlistarr)): for peeridx in range(1, len(peerlistarr)):
logging.debug('Adding split connection -%d for subnet %s' % (peeridx + 1, peerlistarr[peeridx])) logging.debug('Adding split connection -%d for subnet %s' % (peeridx + 1, peerlistarr[peeridx]))

1
ui/src/views/network/StaticRoutesTab.vue
View File

@ -304,7 +304,6 @@ export default {
}, },
openTagsModal (route) { openTagsModal (route) {
this.selectedRule = route this.selectedRule = route
this.rulesRef.value.resetFields()
this.fetchTags(this.selectedRule) this.fetchTags(this.selectedRule)
this.tagsModalVisible = true this.tagsModalVisible = true
} }