The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxd/pull/7825
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 ed5a72761fc73e73d9209b5f12a0bbbdc0010185 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgra...@ubuntu.com>
Date: Thu, 27 Aug 2020 13:22:58 -0400
Subject: [PATCH 1/4] doc/networks: Escaping
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 | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/doc/networks.md b/doc/networks.md
index c44dca2abf..4a7182bf29 100644
--- a/doc/networks.md
+++ b/doc/networks.md
@@ -267,10 +267,10 @@ Install the OVN tools and configure the OVN integration
bridge on the local node
```
apt install ovn-host ovn-central
-ovs-vsctl set open_vswitch . \
- external_ids:ovn-remote=unix:/var/run/ovn/ovnsb_db.sock \
- external_ids:ovn-encap-type=geneve \
- external_ids:ovn-encap-ip=n.n.n.n \ # The IP of your LXD host on the LAN
+ovs-vsctl set open\_vswitch . \
+ external\_ids:ovn-remote=unix:/var/run/ovn/ovnsb_db.sock \
+ external\_ids:ovn-encap-type=geneve \
+ external\_ids:ovn-encap-ip=n.n.n.n \ # The IP of your LXD host on the LAN
```
Create an OVN network and an instance using it:
From 51c0cbf92e2be23b40696af4411c15940fc4e4eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgra...@ubuntu.com>
Date: Thu, 27 Aug 2020 13:23:07 -0400
Subject: [PATCH 2/4] doc/networks: Rename OVN parent 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>
---
doc/networks.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/networks.md b/doc/networks.md
index 4a7182bf29..15634fe260 100644
--- a/doc/networks.md
+++ b/doc/networks.md
@@ -276,7 +276,7 @@ ovs-vsctl set open\_vswitch . \
Create an OVN network and an instance using it:
```
-lxc network create ovntest --type=ovn parent=lxdbr0
+lxc network create ovntest --type=ovn network=lxdbr0
lxc init images:ubuntu/focal c1
lxc config device override c1 eth0 network=ovntest
lxc start c1
@@ -296,4 +296,4 @@ dns.domain | string | -
| lxd
dns.search | string | - | -
| Full comma separated domain search list, defaulting to
`dns.domain` value
ipv4.address | string | standard mode | random
unused subnet | IPv4 address for the bridge (CIDR notation). Use "none" to
turn off IPv4 or "auto" to generate a new one
ipv6.address | string | standard mode | random
unused subnet | IPv6 address for the bridge (CIDR notation). Use "none" to
turn off IPv6 or "auto" to generate a new one
-parent | string | - | -
| Parent network to use for outbound external network access
+network | string | - | -
| Parent network to use for outbound external network access
From b5a904aa63efdb03f403fcfda2645c6c29aeb4b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgra...@ubuntu.com>
Date: Thu, 27 Aug 2020 13:23:22 -0400
Subject: [PATCH 3/4] lxd/networks/ovn: Rename parent 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>
---
lxd/network/driver_ovn.go | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/lxd/network/driver_ovn.go b/lxd/network/driver_ovn.go
index 4066ee366c..1904ee7f78 100644
--- a/lxd/network/driver_ovn.go
+++ b/lxd/network/driver_ovn.go
@@ -33,8 +33,8 @@ import (
const ovnGeneveTunnelMTU = 1442
const ovnChassisPriorityMax = 32767
-const ovnVolatileParentIPv4 = "volatile.parent.ipv4.address"
-const ovnVolatileParentIPv6 = "volatile.parent.ipv6.address"
+const ovnVolatileParentIPv4 = "volatile.network.ipv4.address"
+const ovnVolatileParentIPv6 = "volatile.network.ipv6.address"
// ovnParentVars OVN object variables derived from parent network.
type ovnParentVars struct {
@@ -67,7 +67,7 @@ type ovn struct {
// Validate network config.
func (n *ovn) Validate(config map[string]string) error {
rules := map[string]func(value string) error{
- "parent": func(value string) error {
+ "network": func(value string) error {
if err := validInterfaceName(value); err != nil {
return errors.Wrapf(err, "Invalid network name
%q", value)
}
@@ -263,7 +263,7 @@ func (n *ovn) getIntSwitchInstancePortPrefix() string {
// setupParentPort initialises the parent uplink connection. Returns the
derived ovnParentVars settings used
// during the initial creation of the logical network.
func (n *ovn) setupParentPort(routerMAC net.HardwareAddr) (*ovnParentVars,
error) {
- parentNet, err := LoadByName(n.state, n.config["parent"])
+ parentNet, err := LoadByName(n.state, n.config["network"])
if err != nil {
return nil, errors.Wrapf(err, "Failed loading parent network")
}
@@ -412,7 +412,7 @@ func (n *ovn) parentAllAllocatedIPs(tx *db.ClusterTx,
parentNetName string) ([]n
v6IPs := make([]net.IP, 0)
for _, netInfo := range networks {
- if netInfo.Type != "ovn" || netInfo.Config["parent"] !=
parentNetName {
+ if netInfo.Type != "ovn" || netInfo.Config["network"] !=
parentNetName {
continue
}
@@ -486,7 +486,7 @@ func (n *ovn) parentAllocateIP(ipRanges []*shared.IPRange,
allAllocated []net.IP
// startParentPort performs any network start up logic needed to connect the
parent uplink connection to OVN.
func (n *ovn) startParentPort() error {
- parentNet, err := LoadByName(n.state, n.config["parent"])
+ parentNet, err := LoadByName(n.state, n.config["network"])
if err != nil {
return errors.Wrapf(err, "Failed loading parent network")
}
@@ -614,7 +614,7 @@ func (n *ovn) startParentPortBridge(parentNet Network)
error {
// deleteParentPort deletes the parent uplink connection.
func (n *ovn) deleteParentPort() error {
- parentNet, err := LoadByName(n.state, n.config["parent"])
+ parentNet, err := LoadByName(n.state, n.config["network"])
if err != nil {
return errors.Wrapf(err, "Failed loading parent network")
}
From 8a37886bfa94d2504cc9b9f0081b0a7d639e9e7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgra...@ubuntu.com>
Date: Thu, 27 Aug 2020 13:23:40 -0400
Subject: [PATCH 4/4] scripts/bash: Add network config key
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 fde21f3335..27b1ed2018 100644
--- a/scripts/bash/lxd-client
+++ b/scripts/bash/lxd-client
@@ -132,7 +132,7 @@ _have lxc && {
ipv4.dhcp.ranges ipv4.firewall ipv4.nat ipv4.nat.address ipv4.nat.order
ipv4.ovn.ranges \
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.ovn.ranges \
- ipv6.routes ipv6.routing maas.subnet.ipv4 maas.subnet.ipv6 mtu parent
raw.dnsmasq vlan"
+ ipv6.routes ipv6.routing maas.subnet.ipv4 maas.subnet.ipv6 mtu network
parent raw.dnsmasq vlan"
project_keys="features.images features.profiles features.storage.volumes \
limits.containers limits.virtual-machines limits.memory limits.processes
limits.cpu \
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
