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

Author: shwstppr

ui/src/views/compute/DeployVM.vue

@@ -1476,6 +1476,9 @@ export default {
     isCustomizedIOPS () {
       return this.rootDiskSelected?.iscustomizediops || this.serviceOffering?.iscustomizediops || false
     },
+    deployMenuOptions () {
+      return [this.form.startvm ? this.$t('label.launch.vm.and.stay') : this.$t('label.create.vm.and.stay')]
+    },
     isModernImageSelection () {
       return this.$config.imageSelectionInterface === undefined || this.$config.imageSelectionInterface === 'modern'
     },

ui/src/views/compute/DeployVnfAppliance.vue

@@ -1338,6 +1338,9 @@ export default {
     isCustomizedIOPS () {
       return this.rootDiskSelected?.iscustomizediops || this.serviceOffering?.iscustomizediops || false
     },
+    deployMenuOptions () {
+      return [this.$t('label.launch.vnf.appliance.and.stay')]
+    },
     isModernImageSelection () {
       return this.$config.imageSelectionInterface === undefined || this.$config.imageSelectionInterface === 'modern'
     },