Skip to content

slapos
slapos
Commit e8faba06 authored by Alain Takoudjou's avatar Alain Takoudjou
Browse files
Options

Merge branch 'master' into 1.0

parents ed459ed1 d9192885
Show whitespace changes
Inline Side-by-side
Showing with 44 additions and 20 deletions
software/kvm/instance-kvm-resilient-input-schema.json
View file @ e8faba06
...@@ -7,6 +7,13 @@ ...@@ -7,6 +7,13 @@
}, },
{ {
"properties": { "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": { "-sla-0-computer_guid": {
"title": "Target computer for main instance", "title": "Target computer for main instance",
"description": "Target computer GUID for main instance.", "description": "Target computer GUID for main instance.",
...@@ -19,12 +26,24 @@ ...@@ -19,12 +26,24 @@
"type": "string", "type": "string",
"optional": true "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-2-computer_guid": {
"title": "Target computer for second clone", "title": "Target computer for second clone",
"description": "Target computer for second clone and PBS.", "description": "Target computer for second clone and PBS.",
"type": "string", "type": "string",
"optional": true "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": { "resiliency-backup-periodicity": {
"title": "Periodicity of backup", "title": "Periodicity of backup",
"description": "Periodicity of backup, in cron format.", "description": "Periodicity of backup, in cron format.",
...@@ -38,13 +57,6 @@ ...@@ -38,13 +57,6 @@
"default": "2W", "default": "2W",
"optional": true "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": { "ignore-known-hosts-file": {
"title": "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).", "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).",
......
software/slaprunner/instance-runner-resilient-input-schema.json
View file @ e8faba06
...@@ -7,21 +7,41 @@ ...@@ -7,21 +7,41 @@
}, },
{ {
"properties": { "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", "title": "Target computer for main instance",
"description": "Target computer GUID for main instance.", "description": "Target computer GUID for main instance.",
"type": "string", "type": "string",
"optional": true "optional": true
}, },
"-sla-1-computer_guid": { "-sla-runner1-computer_guid": {
"title": "Target computer for first clone", "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", "type": "string",
"optional": true "optional": true
}, },
"-sla-2-computer_guid": { "-sla-runner2-computer_guid": {
"title": "Target computer for second clone", "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", "type": "string",
"optional": true "optional": true
}, },
...@@ -38,14 +58,6 @@ ...@@ -38,14 +58,6 @@
"default": "2W", "default": "2W",
"optional": true "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": { "ignore-known-hosts-file": {
"title": "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).", "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).",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7