From 192031f0be11ca0c979a2bf4b3d79dffcf3fd8f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= <cedric.dsm@tiolive.com> Date: Thu, 3 Oct 2013 15:21:39 +0200 Subject: [PATCH] fixup! KVM SR: Update readme about resilience. --- software/kvm/README.txt | 10 +++++- software/kvm/instance-kvm-input-schema.json | 1 - .../instance-kvm-resilient-input-schema.json | 33 +++++++++++++++++++ 3 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 software/kvm/instance-kvm-resilient-input-schema.json diff --git a/software/kvm/README.txt b/software/kvm/README.txt index 47be6b959..ddfa67115 100644 --- a/software/kvm/README.txt +++ b/software/kvm/README.txt @@ -59,10 +59,18 @@ Like KVM instance, but backed-up (with history) in two places. kvm = 'http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.188:/software/kvm/software.cfg' myresilientkvm = request( software_release=kvm, - partition_reference="myresilientkvm", + partition_reference="My resilient KVM", software_type="kvm-resilient", + partition_parameter_kw={ + "-sla-0-computer_guid": "COMP-1000", # Location of the main instance (KVM) + "-sla-1-computer_guid": "COMP-1001", # Location of the first clone + "-sla-2-computer_guid": "COMP-1002", # Location of the second clone + } ) +See the instance-kvm-input-schema.json AND instance-kvm-resilient-input-schema.json AND /stack/resilient/README.txt +files for more instance parameters (cpu-count, ram-size, disk-size, specific location of clones, etc). + Then, if you want one of the two clones to takeover, you need to login into the hosting machine, go to the partition of the clone, and invoke bin/takeover. diff --git a/software/kvm/instance-kvm-input-schema.json b/software/kvm/instance-kvm-input-schema.json index 98b6ef6b6..468b4db4e 100644 --- a/software/kvm/instance-kvm-input-schema.json +++ b/software/kvm/instance-kvm-input-schema.json @@ -78,7 +78,6 @@ "description": "MD5 checksum of virtual hard drive, used if virtual-hard-drive-url is specified.", "type": "string", }, -virtual-hard-drive-md5sum "use-tap": { "title": "Use QEMU TAP network interface", diff --git a/software/kvm/instance-kvm-resilient-input-schema.json b/software/kvm/instance-kvm-resilient-input-schema.json new file mode 100644 index 000000000..b9e44ebe1 --- /dev/null +++ b/software/kvm/instance-kvm-resilient-input-schema.json @@ -0,0 +1,33 @@ +{ + "type": "object", + "$schema": "http://json-schema.org/draft-04/schema", + "items": { + "allOf": [ + { + "$ref": "instance-kvm-input-schema.json" + } + ], + "title": "Input Parameters", + "properties": { + "-sla-0-computer_guid": { + "title": "Target computer for main instance", + "description": "Target computer GUID for main instance.", + "type": "string" + }, + "-sla-1-computer_guid": { + "title": "Target computer for first clone", + "description": "Target computer for first clone and PBS.", + "type": "string" + }, + "-sla-2-computer_guid": { + "title": "Target computer for second clone", + "description": "Target computer for second clone and PBS.", + "type": "string" + }, + "resiliency-backup-periodicity": { + "title": "Periodicity of backup", + "description": "Periodicity of backup, in cron format.", + "type": "string" + } + } +} -- 2.30.9