diff --git a/software/kvm/instance-kvm-resilient-input-schema.json b/software/kvm/instance-kvm-resilient-input-schema.json index cf106bbeeb2d1ce9d00b872adebe0b22915a0bf4..9d947f644fbae076c33af24f03c0e370e52af5b9 100644 --- a/software/kvm/instance-kvm-resilient-input-schema.json +++ b/software/kvm/instance-kvm-resilient-input-schema.json @@ -7,6 +7,13 @@ }, { "properties": { + "resilient-clone-number": { + "title": "Amount of backup(s) to create", + "description": "Amount of backup(s) to create. Each backup consists of a Pull Backup Server and a clone.", + "type": "integer", + "default": 1, + "optional": true + }, "-sla-0-computer_guid": { "title": "Target computer for main instance", "description": "Target computer GUID for main instance.", @@ -19,12 +26,24 @@ "type": "string", "optional": true }, + "-sla-pbs1-computer_guid": { + "title": "Target computer for first PBS", + "description": "Target computer for first PBS instance.", + "type": "string", + "optional": true + }, "-sla-2-computer_guid": { "title": "Target computer for second clone", "description": "Target computer for second clone and PBS.", "type": "string", "optional": true }, + "-sla-pbs2-computer_guid": { + "title": "Target computer for second PBS", + "description": "Target computer for second PBS instance.", + "type": "string", + "optional": true + }, "resiliency-backup-periodicity": { "title": "Periodicity of backup", "description": "Periodicity of backup, in cron format.", @@ -38,13 +57,6 @@ "default": "2W", "optional": true }, - "resilient-clone-number": { - "title": "Amount of backup(s) to create", - "description": "Amount of backup(s) to create. Each backup consists of a Pull Backup Server and a clone.", - "type": "integer", - "default": 1, - "optional": true - }, "ignore-known-hosts-file": { "title": "Ignore known_hosts file", "description": "Set either to fill known_hosts file for ssh or not. Useful if main instance and PBS are using the same IP (slapos proxy, webrunner).", diff --git a/software/slaprunner/instance-runner-resilient-input-schema.json b/software/slaprunner/instance-runner-resilient-input-schema.json index 6b473b20feb91ec6f7c05cf916bfbdb16fc15ba6..8fd112d525d2167ab638be52ea290caf25957768 100644 --- a/software/slaprunner/instance-runner-resilient-input-schema.json +++ b/software/slaprunner/instance-runner-resilient-input-schema.json @@ -7,21 +7,41 @@ }, { "properties": { - "-sla-0-computer_guid": { + "resilient-clone-number": { + "title": "Amount of backup(s) to create", + "description": "Amount of backup(s) to create. Each backup consists of a Pull Backup Server and a clone.", + "type": "integer", + "default": 1, + "enum": [1, 2], + "optional": true + }, + "-sla-runner0-computer_guid": { "title": "Target computer for main instance", "description": "Target computer GUID for main instance.", "type": "string", "optional": true }, - "-sla-1-computer_guid": { + "-sla-runner1-computer_guid": { "title": "Target computer for first clone", - "description": "Target computer for first clone and PBS.", + "description": "Target computer for first clone instance.", + "type": "string", + "optional": true + }, + "-sla-pbs1-computer_guid": { + "title": "Target computer for first PBS", + "description": "Target computer for first PBS instance.", "type": "string", "optional": true }, - "-sla-2-computer_guid": { + "-sla-runner2-computer_guid": { "title": "Target computer for second clone", - "description": "Target computer for second clone and PBS.", + "description": "Target computer for second clone instance.", + "type": "string", + "optional": true + }, + "-sla-pbs2-computer_guid": { + "title": "Target computer for second PBS", + "description": "Target computer for second PBS instance.", "type": "string", "optional": true }, @@ -38,14 +58,6 @@ "default": "2W", "optional": true }, - "resilient-clone-number": { - "title": "Amount of backup(s) to create", - "description": "Amount of backup(s) to create. Each backup consists of a Pull Backup Server and a clone.", - "type": "integer", - "default": 1, - "enum": [1, 2], - "optional": true - }, "ignore-known-hosts-file": { "title": "Ignore known_hosts file", "description": "Set either to fill known_hosts file for ssh or not. Useful if main instance and PBS are using the same IP (slapos proxy, webrunner).",