hi,

this patch sould fix https://code.google.com/p/ganeti/issues/detail?id=804


2014-05-14 18:14 GMT+02:00 Ansgar Jazdzewski <[email protected]>:

> From: Ansgar Jazdzewski <[email protected]>
>
> Signed-off-by: Ansgar Jazdzewski <[email protected]>
> ---
>  lib/config.py       | 2 ++
>  tools/net-common.in | 5 +++++
>  2 files changed, 7 insertions(+)
>
> diff --git a/lib/config.py b/lib/config.py
> index 15707da..de803a8 100644
> --- a/lib/config.py
> +++ b/lib/config.py
> @@ -853,6 +853,8 @@ class ConfigWriter(object):
>            link = "bridge:%s" % nic_link
>          elif nic_mode == constants.NIC_MODE_ROUTED:
>            link = "route:%s" % nic_link
> +        elif nic_mode == constants.NIC_MODE_OVS:
> +          link = "ovs:%s" % nic_link
>          else:
>            raise errors.ProgrammerError("NIC mode '%s' not handled" %
> nic_mode)
>
> diff --git a/tools/net-common.in b/tools/net-common.in
> index 7305875..6758555 100644
> --- a/tools/net-common.in
> +++ b/tools/net-common.in
> @@ -60,6 +60,11 @@ function setup_bridge {
>
>  function setup_ovs {
>    if [ "$MODE" = "openvswitch" ]; then
> +    # Remove stale port
> +    ovs-vsctl del-port $INTERFACE || true
> +    # Bring interface up
> +    ip link set $INTERFACE up
> +    # Add port
>      ovs-vsctl add-port ${LINK} $INTERFACE
>    fi
>  }
> --
> 1.9.1
>
>

Reply via email to