[ovs-git] [ovn-org/ovn] ea3b80: Remove python six library

Michele Baldessari noreply at github.com
Fri Jun 5 12:42:36 UTC 2020

  Branch: refs/heads/branch-20.06
  Home:   https://github.com/ovn-org/ovn
  Commit: ea3b80279e3bdce0c4d0b6565469d2a414f05324
  Author: Brian Haley <haleyb.dev at gmail.com>
  Date:   2020-06-05 (Fri, 05 Jun 2020)

  Changed paths:
    M Documentation/intro/install/general.rst
    M Documentation/intro/install/rhel.rst
    M Vagrantfile
    M Vagrantfile-FreeBSD
    M debian/control
    M utilities/docker/debian/build.sh
    M utilities/docker/rhel/build.sh

  Log Message:
  Remove python six library

Since OVN is python3-only, there is no need for six.

Signed-off-by: Brian Haley <haleyb.dev at gmail.com>
Acked-by: Aliasgar Ginwala <aginwala at ebay.com>
Signed-off-by: Numan Siddique <numans at ovn.org>

  Commit: f3bf7588850df49a17b0c630cf710a62e846dab1
  Author: Michele Baldessari <michele at acksyn.org>
  Date:   2020-06-05 (Fri, 05 Jun 2020)

  Changed paths:
    M utilities/ovndb-servers.ocf

  Log Message:
  Make the notify() calls work with IPv6 in the OCF resource-agent

When the VIP is an IPv6 address we get the following error in the
resource agent:
ovndb_servers_notify_0:355:stderr [ + ovn-sbctl -- --id=@conn_uuid create Connection 'target=ptcp\:6642\:[fd00:fd00:fd00:2000::a2]' inactivity_probe=180000 -- set SB_Global . connections=@conn_uuid ]
ovndb_servers_notify_0:355:stderr [ ovn-sbctl: ptcp\:6642\:[fd00:fd00:fd00:2000::a2]: unexpected "[" parsing string ]

This is because MASTER_IP is an IPv6 address and is being passed to
ovn-[ns]bctl without being escaped and the command errors out with
unexpected parsing string errors. The rest of the create Connection
command was already escaping the columns, we are just missing the ip
address bits in case of IPv6.

Let's make sure we escape the '[]:' characters and avoid this problem.
Tested this on an OpenStack environment on both IPv6 and IPv4.

Signed-off-by: Michele Baldessari <michele at acksyn.org>
Signed-off-by: Numan Siddique <numans at ovn.org>

Compare: https://github.com/ovn-org/ovn/compare/411c62a416f1...f3bf7588850d

More information about the git mailing list