[lxc-devel] [lxd/master] Fix spaces, commas, quotes, brackets where needed
fedordikarev on Github
lxc-bot at linuxcontainers.org
Fri Jul 7 13:48:59 UTC 2017
A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 400 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20170707/bddf5df3/attachment.bin>
-------------- next part --------------
From 54b30a5014c834c47d02df4dd2c893ae9b47d8fd Mon Sep 17 00:00:00 2001
From: Fedor Dikarev <yatheo at yandex-team.ru>
Date: Fri, 7 Jul 2017 16:43:10 +0300
Subject: [PATCH] Fix spaces, commas, quotes, brackets where needed
---
doc/rest-api.md | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/doc/rest-api.md b/doc/rest-api.md
index 3728dfa50..a77e740dd 100644
--- a/doc/rest-api.md
+++ b/doc/rest-api.md
@@ -545,10 +545,11 @@ Input (using a remote container, sent over the migration websocket):
"operation": "https://10.0.2.3:8443/1.0/operations/<UUID>", # Full URL to the remote operation (pull mode only)
"certificate": "PEM certificate", # Optional PEM certificate. If not mentioned, system CA is used.
"base-image": "<fingerprint>", # Optional, the base image the container was created from
- "container_only": "true", # Whether to migrate only the container without snapshots. Can be "true" or "false".
+ "container_only": true, # Whether to migrate only the container without snapshots. Can be "true" or "false".
"secrets": {"control": "my-secret-string", # Secrets to use when talking to the migration source
"criu": "my-other-secret",
- "fs": "my third secret"},
+ "fs": "my third secret"}
+ }
}
Input (using a local container):
@@ -565,7 +566,7 @@ Input (using a local container):
},
},
"source": {"type": "copy", # Can be: "image", "migration", "copy" or "none"
- "container_only": "true", # Whether to copy only the container without snapshots. Can be "true" or "false".
+ "container_only": true, # Whether to copy only the container without snapshots. Can be "true" or "false".
"source": "my-old-container"} # Name of the source container
}
@@ -586,8 +587,8 @@ Input (using a remote container, in push mode sent over the migration websocket
"source": {"type": "migration", # Can be: "image", "migration", "copy" or "none"
"mode": "push", # "pull" and "push" are supported
"base-image": "<fingerprint>", # Optional, the base image the container was created from
- "live": true # Whether migration is performed live
- "container_only": "true", # Whether to migrate only the container without snapshots. Can be "true" or "false".
+ "live": true, # Whether migration is performed live
+ "container_only": true} # Whether to migrate only the container without snapshots. Can be "true" or "false".
}
## /1.0/containers/\<name\>
@@ -714,6 +715,7 @@ Input (simple rename):
}
Input (migration across lxd instances):
+
{
"migration": true
}
@@ -1576,7 +1578,7 @@ Input:
"config": {
"ipv4.address": "none",
"ipv6.address": "2001:470:b368:4242::1/64",
- "ipv6.nat": "true"
+ "ipv6.nat": true
}
}
More information about the lxc-devel
mailing list