mirror of https://github.com/containers/podman.git
quadlet: add InterfaceName option to network unit
I noticed this was missing, its a simple 1 to 1 mapping to --interface-name. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
parent
2d234fab34
commit
a0f7db44e8
|
@ -1393,6 +1393,7 @@ Valid options for `[Network]` are listed below:
|
||||||
| Driver=bridge | --driver bridge |
|
| Driver=bridge | --driver bridge |
|
||||||
| Gateway=192.168.55.3 | --gateway 192.168.55.3 |
|
| Gateway=192.168.55.3 | --gateway 192.168.55.3 |
|
||||||
| GlobalArgs=--log-level=debug | --log-level=debug |
|
| GlobalArgs=--log-level=debug | --log-level=debug |
|
||||||
|
| InterfaceName=enp1 | --interface-name enp1 |
|
||||||
| Internal=true | --internal |
|
| Internal=true | --internal |
|
||||||
| IPAMDriver=dhcp | --ipam-driver dhcp |
|
| IPAMDriver=dhcp | --ipam-driver dhcp |
|
||||||
| IPRange=192.168.55.128/25 | --ip-range 192.168.55.128/25 |
|
| IPRange=192.168.55.128/25 | --ip-range 192.168.55.128/25 |
|
||||||
|
@ -1450,6 +1451,14 @@ escaped to allow inclusion of whitespace and other control characters.
|
||||||
|
|
||||||
This key can be listed multiple times.
|
This key can be listed multiple times.
|
||||||
|
|
||||||
|
### `InterfaceName=`
|
||||||
|
|
||||||
|
This option maps the *network_interface* option in the network config, see **podman network inspect**.
|
||||||
|
Depending on the driver, this can have different effects; for `bridge`, it uses the bridge interface name.
|
||||||
|
For `macvlan` and `ipvlan`, it is the parent device on the host. It is the same as `--opt parent=...`.
|
||||||
|
|
||||||
|
This is equivalent to the Podman `--interface-name` option.
|
||||||
|
|
||||||
### `Internal=` (defaults to `false`)
|
### `Internal=` (defaults to `false`)
|
||||||
|
|
||||||
Restrict external access of this network.
|
Restrict external access of this network.
|
||||||
|
|
|
@ -111,6 +111,7 @@ const (
|
||||||
KeyHostName = "HostName"
|
KeyHostName = "HostName"
|
||||||
KeyImage = "Image"
|
KeyImage = "Image"
|
||||||
KeyImageTag = "ImageTag"
|
KeyImageTag = "ImageTag"
|
||||||
|
KeyInterfaceName = "InterfaceName"
|
||||||
KeyInternal = "Internal"
|
KeyInternal = "Internal"
|
||||||
KeyIP = "IP"
|
KeyIP = "IP"
|
||||||
KeyIP6 = "IP6"
|
KeyIP6 = "IP6"
|
||||||
|
@ -372,6 +373,7 @@ var (
|
||||||
KeyIPAMDriver: true,
|
KeyIPAMDriver: true,
|
||||||
KeyIPRange: true,
|
KeyIPRange: true,
|
||||||
KeyIPv6: true,
|
KeyIPv6: true,
|
||||||
|
KeyInterfaceName: true,
|
||||||
KeyInternal: true,
|
KeyInternal: true,
|
||||||
KeyNetworkName: true,
|
KeyNetworkName: true,
|
||||||
KeyNetworkDeleteOnStop: true,
|
KeyNetworkDeleteOnStop: true,
|
||||||
|
@ -975,8 +977,9 @@ func ConvertNetwork(network *parser.UnitFile, name string, unitsInfoMap map[stri
|
||||||
lookupAndAddBoolean(network, NetworkGroup, boolKeys, podman)
|
lookupAndAddBoolean(network, NetworkGroup, boolKeys, podman)
|
||||||
|
|
||||||
stringKeys := map[string]string{
|
stringKeys := map[string]string{
|
||||||
KeyDriver: "--driver",
|
KeyDriver: "--driver",
|
||||||
KeyIPAMDriver: "--ipam-driver",
|
KeyIPAMDriver: "--ipam-driver",
|
||||||
|
KeyInterfaceName: "--interface-name",
|
||||||
}
|
}
|
||||||
lookupAndAddString(network, NetworkGroup, stringKeys, podman)
|
lookupAndAddString(network, NetworkGroup, stringKeys, podman)
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
## assert-podman-final-args systemd-interface-name
|
||||||
|
## assert-podman-args "--interface-name" "enp1"
|
||||||
|
|
||||||
|
[Network]
|
||||||
|
InterfaceName=enp1
|
|
@ -1005,6 +1005,7 @@ BOGUS=foo
|
||||||
Entry("Network - Gateway", "gateway.network"),
|
Entry("Network - Gateway", "gateway.network"),
|
||||||
Entry("Network - IPAM Driver", "ipam-driver.network"),
|
Entry("Network - IPAM Driver", "ipam-driver.network"),
|
||||||
Entry("Network - IPv6", "ipv6.network"),
|
Entry("Network - IPv6", "ipv6.network"),
|
||||||
|
Entry("Network - InterfaceName network", "interface-name.network"),
|
||||||
Entry("Network - Internal network", "internal.network"),
|
Entry("Network - Internal network", "internal.network"),
|
||||||
Entry("Network - Label", "label.network"),
|
Entry("Network - Label", "label.network"),
|
||||||
Entry("Network - Multiple Options", "options.multiple.network"),
|
Entry("Network - Multiple Options", "options.multiple.network"),
|
||||||
|
|
Loading…
Reference in New Issue