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 remote-tracking branch 'apache/4.17' into main

Browse Source
This commit is contained in:
Abhishek Kumar 2022-09-07 14:11:09 +05:30
commit cf18549dbb
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
systemvm/debian/opt/cloud/bin/setup/dhcpsrvr.sh
View File

@ -39,6 +39,10 @@ setup_dhcpsrvr() {
sed -i "s/-A INPUT -i eth0 -p udp -m udp --dport 53 -j ACCEPT/-A INPUT -i eth0 -p udp -m udp --dport 53 -s $DHCP_RANGE\/$CIDR_SIZE -j ACCEPT/g" /etc/iptables/rules.v4 sed -i "s/-A INPUT -i eth0 -p udp -m udp --dport 53 -j ACCEPT/-A INPUT -i eth0 -p udp -m udp --dport 53 -s $DHCP_RANGE\/$CIDR_SIZE -j ACCEPT/g" /etc/iptables/rules.v4
sed -i "s/-A INPUT -i eth0 -p tcp -m tcp --dport 53 -j ACCEPT/-A INPUT -i eth0 -p tcp -m tcp --dport 53 -s $DHCP_RANGE\/$CIDR_SIZE -j ACCEPT/g" /etc/iptables/rules.v4 sed -i "s/-A INPUT -i eth0 -p tcp -m tcp --dport 53 -j ACCEPT/-A INPUT -i eth0 -p tcp -m tcp --dport 53 -s $DHCP_RANGE\/$CIDR_SIZE -j ACCEPT/g" /etc/iptables/rules.v4
log_it "Disable radvd for dhcp server system vm"
rm -rf /etc/radvd.conf
systemctl stop radvd
systemctl disable radvd
} }
dhcpsrvr_svcs dhcpsrvr_svcs

2
ui/src/config/section/project.js
View File

@ -158,7 +158,7 @@ export default {
}, },
groupAction: true, groupAction: true,
popup: true, popup: true,
groupMap: (selection) => { return selection.map(x => { return { id: x } }) }, groupMap: (selection, values) => { return selection.map(x => { return { id: x, cleanup: values.cleanup || null } }) },
args: (record, store) => { args: (record, store) => {
const fields = [] const fields = []
if (store.apis.deleteProject.params.filter(x => x.name === 'cleanup').length > 0) { if (store.apis.deleteProject.params.filter(x => x.name === 'cleanup').length > 0) {

2
ui/src/views/compute/DeployVM.vue
View File

@ -2158,6 +2158,7 @@ export default {
}, },
fetchTemplateNics (template) { fetchTemplateNics (template) {
var nics = [] var nics = []
this.nicToNetworkSelection = []
if (template && template.deployasisdetails && Object.keys(template.deployasisdetails).length > 0) { if (template && template.deployasisdetails && Object.keys(template.deployasisdetails).length > 0) {
var keys = Object.keys(template.deployasisdetails) var keys = Object.keys(template.deployasisdetails)
keys = keys.filter(key => key.startsWith('network-')) keys = keys.filter(key => key.startsWith('network-'))
@ -2169,7 +2170,6 @@ export default {
return a.InstanceID - b.InstanceID return a.InstanceID - b.InstanceID
}) })
if (this.options.networks && this.options.networks.length > 0) { if (this.options.networks && this.options.networks.length > 0) {
this.nicToNetworkSelection = []
for (var i = 0; i < nics.length; ++i) { for (var i = 0; i < nics.length; ++i) {
var nic = nics[i] var nic = nics[i]
nic.id = nic.InstanceID nic.id = nic.InstanceID