The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxd/pull/7093
This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.
=== Description (from pull-request) ===
From 80dc70e1b0c70110ed2fa1e23963c4b9233f6353 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgra...@ubuntu.com>
Date: Fri, 27 Mar 2020 09:39:21 -0400
Subject: [PATCH 1/3] doc/networks: Add missing
maas.subnet.ipv4/maas.subnet.ipv6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Stéphane Graber <stgra...@ubuntu.com>
---
doc/networks.md | 2 ++
1 file changed, 2 insertions(+)
diff --git a/doc/networks.md b/doc/networks.md
index f47620c026..bb221bf575 100644
--- a/doc/networks.md
+++ b/doc/networks.md
@@ -85,6 +85,8 @@ ipv6.nat.order | string | ipv6 address
| before
ipv6.nat.address | string | ipv6 address | -
| The source address used for outbound traffic from the bridge
ipv6.routes | string | ipv6 address | -
| Comma separated list of additional IPv6 CIDR subnets to
route to the bridge
ipv6.routing | boolean | ipv6 address | true
| Whether to route traffic in and out of the bridge
+maas.subnet.ipv4 | string | ipv4 address | -
| MAAS IPv4 subnet to register instances in (when using
`network` property on nic)
+maas.subnet.ipv6 | string | ipv6 address | -
| MAAS IPv6 subnet to register instances in (when using
`network` property on nic)
raw.dnsmasq | string | - | -
| Additional dnsmasq configuration to append to the
configuration file
tunnel.NAME.group | string | vxlan |
239.0.0.1 | Multicast address for vxlan (used if local and
remote aren't set)
tunnel.NAME.id | integer | vxlan | 0
| Specific tunnel ID to use for the vxlan tunnel
From 4aa13d7d1d5ef2581243c62f7b52b252cd85998b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgra...@ubuntu.com>
Date: Fri, 27 Mar 2020 09:40:12 -0400
Subject: [PATCH 2/3] scripts/bash: Add maas.subnet.ipv4/maas.subnet/ipv6 to
network
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Stéphane Graber <stgra...@ubuntu.com>
---
scripts/bash/lxd-client | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/bash/lxd-client b/scripts/bash/lxd-client
index 327ae02767..48739d8810 100644
--- a/scripts/bash/lxd-client
+++ b/scripts/bash/lxd-client
@@ -128,7 +128,7 @@ _have lxc && {
ipv4.dhcp.ranges ipv4.firewall ipv4.nat ipv4.nat.address ipv4.nat.order \
ipv4.routes ipv4.routing ipv6.address ipv6.dhcp ipv6.dhcp.expiry
ipv6.dhcp.ranges \
ipv6.dhcp.stateful ipv6.firewall ipv6.nat ipv6.nat.address
ipv6.nat.order \
- ipv6.routes ipv6.routing raw.dnsmasq"
+ ipv6.routes ipv6.routing maas.subnet.ipv4 maas.subnet.ipv6 raw.dnsmasq"
project_keys="features.images features.profiles features.storage.volumes \
limits.containers limits.virtual-machines limits.memory limits.processes
limits.cpu \
From e8b663b4247cb12fcad525a45ffe3c06bbbb66e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgra...@ubuntu.com>
Date: Fri, 27 Mar 2020 09:42:24 -0400
Subject: [PATCH 3/3] client: Fix bad description for UpdateClusterMember
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Stéphane Graber <stgra...@ubuntu.com>
---
client/lxd_cluster.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/client/lxd_cluster.go b/client/lxd_cluster.go
index c0f9181dc5..7922ce1149 100644
--- a/client/lxd_cluster.go
+++ b/client/lxd_cluster.go
@@ -108,7 +108,7 @@ func (r *ProtocolLXD) GetClusterMember(name string)
(*api.ClusterMember, string,
return &member, etag, nil
}
-// UpdateClusterMember returns information about the given member
+// UpdateClusterMember updates information about the given member
func (r *ProtocolLXD) UpdateClusterMember(name string, member
api.ClusterMemberPut, ETag string) error {
if !r.HasExtension("clustering_edit_roles") {
return fmt.Errorf("The server is missing the required
\"clustering_edit_roles\" API extension")
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
