From 496a9cbf7b5db50930d7bd228231012731349b25 Mon Sep 17 00:00:00 2001 From: Michal Skrivanek Date: Thu, 23 Mar 2023 09:49:08 +0100 Subject: [PATCH] Drop python-netaddr dependency it's nothing but a headache to keep up with ansible's idea of bumping python every few months. Let's drop it entirely. --- ovirt-engine.spec.in | 1 - .../project/ovirt-host-reconfigure-ovn.yml | 1 - .../roles/ovirt-provider-ovn-driver/tasks/configure.yml | 3 +-- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/ovirt-engine.spec.in b/ovirt-engine.spec.in index 3aba55daca9..dd7ec6d96c0 100644 --- a/ovirt-engine.spec.in +++ b/ovirt-engine.spec.in @@ -611,7 +611,6 @@ Requires: ovirt-engine-metrics >= 1.3.4.1 Requires: java-11-openjdk-headless >= %{openjdk_version} Requires: logrotate Requires: python3-dateutil -Requires: python3-netaddr Requires: python3-psycopg2 Requires: python3-six Requires(pre): shadow-utils diff --git a/packaging/ansible-runner-service-project/project/ovirt-host-reconfigure-ovn.yml b/packaging/ansible-runner-service-project/project/ovirt-host-reconfigure-ovn.yml index f25d8a8d829..fe9035f28a8 100644 --- a/packaging/ansible-runner-service-project/project/ovirt-host-reconfigure-ovn.yml +++ b/packaging/ansible-runner-service-project/project/ovirt-host-reconfigure-ovn.yml @@ -38,4 +38,3 @@ - ovirt_openvswitch_pre.version is version('2.11', '==') - ovirt_openvswitch_post.version is version('2.15', '>=') - ovn_central is defined - - ovn_central | ipaddr diff --git a/packaging/ansible-runner-service-project/project/roles/ovirt-provider-ovn-driver/tasks/configure.yml b/packaging/ansible-runner-service-project/project/roles/ovirt-provider-ovn-driver/tasks/configure.yml index 45525a1690a..7804c1d7fe1 100644 --- a/packaging/ansible-runner-service-project/project/roles/ovirt-provider-ovn-driver/tasks/configure.yml +++ b/packaging/ansible-runner-service-project/project/roles/ovirt-provider-ovn-driver/tasks/configure.yml @@ -12,7 +12,7 @@ enabled: true when: - - cluster_switch == "ovs" or (ovn_central is defined and ovn_central | ipaddr) + - cluster_switch == "ovs" or (ovn_central is defined) - block: - name: Install ovirt-provider-ovn-driver @@ -46,4 +46,3 @@ when: - ovn_central is defined - - ovn_central | ipaddr