diff --git a/qmi-cloud-cli/jobs/destroy5.js b/qmi-cloud-cli/jobs/destroy5.js index eaa271e..67095ab 100644 --- a/qmi-cloud-cli/jobs/destroy5.js +++ b/qmi-cloud-cli/jobs/destroy5.js @@ -61,6 +61,7 @@ async function init(type) { var filter = { "isDestroyed":false, "isDeleted": false, + "$or": [ {"runForever":{ "$exists": false }}, {"runForever": false}], "statusVms": "Stopped", "vmImage": {"$exists": true}, "vmImage.vm1": { "$exists": true } diff --git a/qmi-cloud-cli/jobs/stop5.js b/qmi-cloud-cli/jobs/stop5.js index e701462..861f5b9 100644 --- a/qmi-cloud-cli/jobs/stop5.js +++ b/qmi-cloud-cli/jobs/stop5.js @@ -61,6 +61,7 @@ async function init(type) { var filter = { "isDestroyed": false, "isDeleted": false, + "$or": [ {"runForever":{ "$exists": false }}, {"runForever": false}], "statusVms": "Running", "vmImage": { "$exists": true }, "vmImage.vm1": { "$exists": true } diff --git a/qmi-cloud-cli/package.json b/qmi-cloud-cli/package.json index b97ad2c..d2b0425 100644 --- a/qmi-cloud-cli/package.json +++ b/qmi-cloud-cli/package.json @@ -1,6 +1,6 @@ { "name": "qmi-cloud-cli", - "version": "1.3.0", + "version": "1.3.1", "scripts": { }, "private": true, diff --git a/qmi-cloud-common/models/Provision.js b/qmi-cloud-common/models/Provision.js index 826ebf0..e626bcb 100644 --- a/qmi-cloud-common/models/Provision.js +++ b/qmi-cloud-common/models/Provision.js @@ -106,6 +106,10 @@ const provisionSchema = new mongoose.Schema({ parent: { type: mongoose.Types.ObjectId, ref: 'Provision' + }, + runForever: { + type: Boolean, + default: false } },{ toObject: {virtuals:true},