Merge remote-tracking branch 'apache/4.17' into main

Author: shwstppr

systemvm/debian/opt/cloud/bin/setup/dhcpsrvr.sh

@@ -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 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

ui/src/config/section/project.js

@@ -158,7 +158,7 @@ export default {
       },
       groupAction: 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) => {
         const fields = []
         if (store.apis.deleteProject.params.filter(x => x.name === 'cleanup').length > 0) {

ui/src/views/compute/DeployVM.vue

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