The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxd/pull/5772
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) ===
For https://github.com/lxc/lxd/issues/5765
From 5b5e2477b999307cdf400ba3b1812a7a7fe85184 Mon Sep 17 00:00:00 2001
From: Thomas Parrott <thomas.parr...@canonical.com>
Date: Fri, 17 May 2019 09:46:13 +0100
Subject: [PATCH 1/2] doc: Adds support for vlan and security.mac_filtering for
sriov
Signed-off-by: Thomas Parrott <thomas.parr...@canonical.com>
---
doc/containers.md | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/doc/containers.md b/doc/containers.md
index c9571a8846..48137ab0ed 100644
--- a/doc/containers.md
+++ b/doc/containers.md
@@ -237,25 +237,25 @@ LXD supports different kind of network devices:
Different network interface types have different additional properties, the
current list is:
-Key | Type | Default | Required | Used by
| API extension |
Description
-:-- | :-- | :-- | :-- | :--
| :-- | :--
-nictype | string | - | yes | all
| - | The
device type, one of "bridged", "macvlan", "ipvlan", "p2p", "physical", or
"sriov"
-limits.ingress | string | - | no | bridged,
p2p | - | I/O
limit in bit/s for incoming traffic (various suffixes supported, see below)
-limits.egress | string | - | no | bridged,
p2p | - | I/O
limit in bit/s for outgoing traffic (various suffixes supported, see below)
-limits.max | string | - | no | bridged,
p2p | - |
Same as modifying both limits.ingress and limits.egress
-name | string | kernel assigned | no | all
| - | The
name of the interface inside the container
-host\_name | string | randomly assigned | no | bridged,
p2p | - | The
name of the interface inside the host
-hwaddr | string | randomly assigned | no | bridged,
macvlan, physical, sriov | - | The
MAC address of the new interface
-mtu | integer | parent MTU | no | all
| - | The
MTU of the new interface
-parent | string | - | yes | bridged,
macvlan, ipvlan, physical, sriov | - | The
name of the host device or bridge
-vlan | integer | - | no | macvlan,
ipvlan, physical | network\_vlan, network\_vlan\_physical | The
VLAN ID to attach to
-ipv4.address | string | - | no | bridged,
ipvlan | network | An
IPv4 address to assign to the container through DHCP (bridged), for IPVLAN
comma separated list of static addresses (at least 1 required)
-ipv6.address | string | - | no | bridged,
ipvlan | network | An
IPv6 address to assign to the container through DHCP (bridged), for IPVLAN
comma separated list of static addresses (at least 1 required)
-ipv4.routes | string | - | no | bridged,
p2p | container\_nic\_routes |
Comma delimited list of IPv4 static routes to add on host to nic
-ipv6.routes | string | - | no | bridged,
p2p | container\_nic\_routes |
Comma delimited list of IPv6 static routes to add on host to nic
-security.mac\_filtering | boolean | false | no | bridged
| network |
Prevent the container from spoofing another's MAC address
-maas.subnet.ipv4 | string | - | no | bridged,
macvlan, physical, sriov | maas\_network |
MAAS IPv4 subnet to register the container in
-maas.subnet.ipv6 | string | - | no | bridged,
macvlan, physical, sriov | maas\_network |
MAAS IPv6 subnet to register the container in
+Key | Type | Default | Required | Used by
| API extension
| Description
+:-- | :-- | :-- | :-- | :--
| :--
| :--
+nictype | string | - | yes | all
| -
| The device type, one of "bridged", "macvlan", "ipvlan",
"p2p", "physical", or "sriov"
+limits.ingress | string | - | no | bridged,
p2p | -
| I/O limit in bit/s for incoming traffic (various suffixes
supported, see below)
+limits.egress | string | - | no | bridged,
p2p | -
| I/O limit in bit/s for outgoing traffic (various suffixes
supported, see below)
+limits.max | string | - | no | bridged,
p2p | -
| Same as modifying both limits.ingress and limits.egress
+name | string | kernel assigned | no | all
| -
| The name of the interface inside the container
+host\_name | string | randomly assigned | no | bridged,
p2p | -
| The name of the interface inside the host
+hwaddr | string | randomly assigned | no | bridged,
macvlan, physical, sriov | -
| The MAC address of the new interface
+mtu | integer | parent MTU | no | all
| -
| The MTU of the new interface
+parent | string | - | yes | bridged,
macvlan, ipvlan, physical, sriov | -
| The name of the host device or bridge
+vlan | integer | - | no | macvlan,
ipvlan, physical, sriov | network\_vlan, network\_vlan\_physical,
network\_vlan\_sriov | The VLAN ID to attach to
+ipv4.address | string | - | no | bridged,
ipvlan | network
| An IPv4 address to assign to the container through DHCP
(bridged), for IPVLAN comma separated list of static addresses (at least 1
required)
+ipv6.address | string | - | no | bridged,
ipvlan | network
| An IPv6 address to assign to the container through DHCP
(bridged), for IPVLAN comma separated list of static addresses (at least 1
required)
+ipv4.routes | string | - | no | bridged,
p2p | container\_nic\_routes
| Comma delimited list of IPv4 static routes to add on host to
nic
+ipv6.routes | string | - | no | bridged,
p2p | container\_nic\_routes
| Comma delimited list of IPv6 static routes to add on host to
nic
+security.mac\_filtering | boolean | false | no | bridged,
sriov | network
| Prevent the container from spoofing another's MAC address
+maas.subnet.ipv4 | string | - | no | bridged,
macvlan, physical, sriov | maas\_network
| MAAS IPv4 subnet to register the container in
+maas.subnet.ipv6 | string | - | no | bridged,
macvlan, physical, sriov | maas\_network
| MAAS IPv6 subnet to register the container in
#### bridged, macvlan or ipvlan for connection to physical network
The `bridged`, `macvlan` and `ipvlan` interface types can both be used to
connect
From 3b3b4c306811994fc5f27a85b934e335bf78a24f Mon Sep 17 00:00:00 2001
From: Thomas Parrott <thomas.parr...@canonical.com>
Date: Fri, 17 May 2019 09:47:32 +0100
Subject: [PATCH 2/2] doc: Removes trailing whitespace
Signed-off-by: Thomas Parrott <thomas.parr...@canonical.com>
---
doc/containers.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/containers.md b/doc/containers.md
index 48137ab0ed..0fd79956a2 100644
--- a/doc/containers.md
+++ b/doc/containers.md
@@ -599,7 +599,7 @@ empty (default), no snapshots will be created.
`snapshots.schedule.stopped`
controls whether or not stopped container are to be automatically snapshotted.
It defaults to `false`. `snapshots.pattern` takes a pongo2 template string,
and the pongo2 context contains the `creation_date` variable. Be aware that you
-should format the date (e.g. use `{{ creation_date|date:"2006-01-02_15-04-05"
}}`)
+should format the date (e.g. use `{{ creation_date|date:"2006-01-02_15-04-05"
}}`)
in your template string to avoid forbidden characters in your snapshot name.
Another way to avoid name collisions is to use the placeholder `%d`. If a
snapshot
with the same name (excluding the placeholder) already exists, all existing
snapshot
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
