On Mon, Mar 31, 2014 at 4:34 PM, Jason Kölker <ja...@koelker.net> wrote:
> Allows setting up type=patch ports through sysconfig ifcfg-* files.
>
> Signed-off-by: Jason Kölker <ja...@koelker.net>
Thank you for the patch. Looks good to me.
I added you to AUTHORS and applied it on master.
> ---
> rhel/README.RHEL | 25 +++++++++++++++++++++++++
> rhel/etc_sysconfig_network-scripts_ifdown-ovs | 3 +++
> rhel/etc_sysconfig_network-scripts_ifup-ovs | 4 ++++
> 3 files changed, 32 insertions(+)
>
> diff --git a/rhel/README.RHEL b/rhel/README.RHEL
> index cb6ab88..2620674 100644
> --- a/rhel/README.RHEL
> +++ b/rhel/README.RHEL
> @@ -25,6 +25,8 @@ assignments. The following OVS-specific variable names are
> supported:
>
> * "OVSTunnel", if <name> is an OVS tunnel.
>
> + * "OVSPatchPort", if <name> is a patch port
> +
> - OVS_BRIDGE: If TYPE is anything other than "OVSBridge", set to
> the name of the OVS bridge to which the port should be attached.
>
> @@ -47,6 +49,9 @@ assignments. The following OVS-specific variable names are
> supported:
> - OVS_TUNNEL_OPTIONS: For "OVSTunnel" interfaces, this field should be
> used to specify the tunnel options like remote_ip, key, etc.
>
> + - OVS_PATCH_PEER: For "OVSPatchPort" devices, this field specifies
> + the patch's peer on the other bridge.
> +
> Note
> ----
>
> @@ -182,6 +187,26 @@ OVS_BRIDGE=ovsbridge0
> OVS_TUNNEL_TYPE=gre
> OVS_TUNNEL_OPTIONS="options:remote_ip=A.B.C.D"
>
> +
> +Patch Ports:
> +
> +==> ifcfg-patch-ovs-0 <==
> +DEVICE=patch-ovs-0
> +ONBOOT=yes
> +DEVICETYPE=ovs
> +TYPE=OVSPatchPort
> +OVS_BRIDGE=ovsbridge0
> +OVS_PATCH_PEER=patch-ovs-1
> +
> +==> ifcfg-patch-ovs-1 <==
> +DEVICE=patch-ovs-1
> +ONBOOT=yes
> +DEVICETYPE=ovs
> +TYPE=OVSPatchPort
> +OVS_BRIDGE=ovsbridge1
> +OVS_PATCH_PEER=patch-ovs-0
> +
> +
> Reporting Bugs
> --------------
>
> diff --git a/rhel/etc_sysconfig_network-scripts_ifdown-ovs
> b/rhel/etc_sysconfig_network-scripts_ifdown-ovs
> index daa5786..6e96d62 100755
> --- a/rhel/etc_sysconfig_network-scripts_ifdown-ovs
> +++ b/rhel/etc_sysconfig_network-scripts_ifdown-ovs
> @@ -56,6 +56,9 @@ case "$TYPE" in
> retval=$?
> ovs-vsctl -t ${TIMEOUT} -- --if-exists del-port "$OVS_BRIDGE"
> "$DEVICE"
> ;;
> + OVSPatchPort)
> + ovs-vsctl -t ${TIMEOUT} -- --if-exists del-port "$OVS_BRIDGE"
> "$DEVICE"
> + ;;
> *)
> echo $"Invalid OVS interface type $TYPE"
> exit 1
> diff --git a/rhel/etc_sysconfig_network-scripts_ifup-ovs
> b/rhel/etc_sysconfig_network-scripts_ifup-ovs
> index 0ee7b21..45143f6 100755
> --- a/rhel/etc_sysconfig_network-scripts_ifup-ovs
> +++ b/rhel/etc_sysconfig_network-scripts_ifup-ovs
> @@ -136,6 +136,10 @@ case "$TYPE" in
> ovs-vsctl -t ${TIMEOUT} -- --may-exist add-port "$OVS_BRIDGE"
> "$DEVICE" $OVS_OPTIONS -- set Interface "$DEVICE" type=$OVS_TUNNEL_TYPE
> $OVS_TUNNEL_OPTIONS ${OVS_EXTRA+-- $OVS_EXTRA}
> ${OTHERSCRIPT} ${CONFIG} ${2}
> ;;
> + OVSPatchPort)
> + ifup_ovs_bridge
> + ovs-vsctl -t ${TIMEOUT} -- --may-exist add-port "$OVS_BRIDGE"
> "$DEVICE" $OVS_OPTIONS -- set Interface "$DEVICE" type=patch
> options:peer=${OVS_PATCH_PEER} ${OVS_EXTRA+-- $OVS_EXTRA}
> + ;;
> *)
> echo $"Invalid OVS interface type $TYPE"
> exit 1
> --
> 1.9.0
>
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
