[meta-virtualization] [PATCH] openvswitch: Add new option to use short hostname for ovs-ctl script

Bruce Ashfield bruce.ashfield at gmail.com
Tue Dec 18 04:59:59 PST 2018


On Tue, Dec 18, 2018 at 12:31 AM Hongzhi.Song
<hongzhi.song at windriver.com> wrote:
>
> [Backport two commits from openvswitch]

At this point in the release cycle, I'd rather not take backports, but
instead a full version bump of OVS instead.

Is there some reason why we can't go to a version that already
contains the patches ? Even if it on a master/unstable branch, that is
still ok at this point in the cycle.

Bruce

>
> Current ovs-ctl forces to set full hostname in external-ids. In
> some situation users may want to set short hostname. For example,
> in OpenStack - OVN integration, Neutron uses the host-id provided
> by Nova, which is usually short hostname, to set "requested-chassis"
> in OVN. The mismatch in hypervisor's external-ids:hostname setting
> causes OVN port binding failure. It can be overridden to short name
> but a openvswitch restart using ovs-ctl would again set it to full
> hostname. This patch ensures in such use cases --no-full-hostname
> can be specified to ovs-ctl to set short hostname instead.
>
> Signed-off-by: Hongzhi.Song <hongzhi.song at windriver.com>
> ---
>  ...-ctl-Add-new-option-to-use-short-hostname.patch | 63 ++++++++++++++++++++++
>  recipes-networking/openvswitch/openvswitch_git.bb  |  1 +
>  2 files changed, 64 insertions(+)
>  create mode 100644 recipes-networking/openvswitch/openvswitch-git/0001-ovs-ctl-Add-new-option-to-use-short-hostname.patch
>
> diff --git a/recipes-networking/openvswitch/openvswitch-git/0001-ovs-ctl-Add-new-option-to-use-short-hostname.patch b/recipes-networking/openvswitch/openvswitch-git/0001-ovs-ctl-Add-new-option-to-use-short-hostname.patch
> new file mode 100644
> index 0000000..b539310
> --- /dev/null
> +++ b/recipes-networking/openvswitch/openvswitch-git/0001-ovs-ctl-Add-new-option-to-use-short-hostname.patch
> @@ -0,0 +1,63 @@
> +From 48091ad4e2417df5494be1a61378785d3bae9733 Mon Sep 17 00:00:00 2001
> +From: "Hongzhi.Song" <hongzhi.song at windriver.com>
> +Date: Mon, 17 Dec 2018 04:16:24 -0500
> +Subject: [PATCH] ovs-ctl: Add new option to use short hostname
> +
> +Current ovs-ctl forces to set full hostname in external-ids. In
> +some situation users may want to set short hostname. For example,
> +in OpenStack - OVN integration, Neutron uses the host-id provided
> +by Nova, which is usually short hostname, to set "requested-chassis"
> +in OVN. The mismatch in hypervisor's external-ids:hostname setting
> +causes OVN port binding failure. It can be overridden to short name
> +but a openvswitch restart using ovs-ctl would again set it to full
> +hostname. This patch ensures in such use cases --no-full-hostname
> +can be specified to ovs-ctl to set short hostname instead.
> +
> +Signed-off-by: Han Zhou <hzhou8 at ebay.com>
> +Signed-off-by: Ben Pfaff <blp at ovn.org>
> +
> +Upstream-Status: Backport [298115b94] and [dd091e163].
> +
> +Signed-off-by: Hongzhi.Song <hongzhi.song at windriver.com>
> +---
> + utilities/ovs-ctl.in | 10 +++++++++-
> + 1 file changed, 9 insertions(+), 1 deletion(-)
> +
> +diff --git a/utilities/ovs-ctl.in b/utilities/ovs-ctl.in
> +index 43c8f32..ca5e1dd 100755
> +--- a/utilities/ovs-ctl.in
> ++++ b/utilities/ovs-ctl.in
> +@@ -38,7 +38,12 @@ insert_mod_if_required () {
> + set_hostname () {
> +     # 'hostname -f' needs network connectivity to work.  So we should
> +     # call this only after ovs-vswitchd is running.
> +-    ovs_vsctl set Open_vSwitch . external-ids:hostname="$(hostname -f)"
> ++    if test X$FULL_HOSTNAME = Xyes; then
> ++        hn="$(hostname -f)" || hn="$(uname -n)"
> ++    else
> ++        hn="$(uname -n)"
> ++    fi
> ++    ovs_vsctl set Open_vSwitch . external-ids:hostname="$hn"
> + }
> +
> + set_system_ids () {
> +@@ -291,6 +296,8 @@ enable_protocol () {
> + set_defaults () {
> +     SYSTEM_ID=
> +
> ++    FULL_HOSTNAME=yes
> ++
> +     DELETE_BRIDGES=no
> +     DELETE_TRANSIENT_PORTS=no
> +
> +@@ -376,6 +383,7 @@ Less important options for "start", "restart" and "force-reload-kmod":
> +   --no-mlockall                  do not lock all of ovs-vswitchd into memory
> +   --ovsdb-server-priority=NICE   set ovsdb-server's niceness (default: $OVSDB_SERVER_PRIORITY)
> +   --ovs-vswitchd-priority=NICE   set ovs-vswitchd's niceness (default: $OVS_VSWITCHD_PRIORITY)
> ++  --no-full-hostname             set short hostname instead of full hostname
> +
> + Debugging options for "start", "restart" and "force-reload-kmod":
> +   --ovsdb-server-wrapper=WRAPPER
> +--
> +2.8.1
> +
> diff --git a/recipes-networking/openvswitch/openvswitch_git.bb b/recipes-networking/openvswitch/openvswitch_git.bb
> index b8bbb3a..9be4a91 100644
> --- a/recipes-networking/openvswitch/openvswitch_git.bb
> +++ b/recipes-networking/openvswitch/openvswitch_git.bb
> @@ -33,6 +33,7 @@ SRC_URI = "file://openvswitch-switch \
>             file://python-switch-remaining-scripts-to-use-python3.patch \
>             file://systemd-update-tool-paths.patch \
>             file://systemd-create-runtime-dirs.patch \
> +           file://0001-ovs-ctl-Add-new-option-to-use-short-hostname.patch \
>             "
>
>  LIC_FILES_CHKSUM = "file://LICENSE;md5=1ce5d23a6429dff345518758f13aaeab"
> --
> 2.8.1
>


-- 
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II


More information about the meta-virtualization mailing list