Skip to content

Commit

Permalink
Merge pull request #644 from karelyatin/edpm_ovs
Browse files Browse the repository at this point in the history
[edpm_bootstrap] Clear leftover from edpm_ovs split
  • Loading branch information
openshift-merge-bot[bot] authored Apr 29, 2024
2 parents b875360 + d58f244 commit 85586df
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 5 deletions.
1 change: 0 additions & 1 deletion roles/edpm_bootstrap/meta/argument_specs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ argument_specs:
- crudini
- jq
- nftables
- openvswitch
- openstack-selinux
- os-net-config
- python3-libselinux
Expand Down
4 changes: 0 additions & 4 deletions roles/edpm_bootstrap/tasks/packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,10 @@
ansible.builtin.dnf:
name: "{{ edpm_bootstrap_packages_bootstrap }}"
state: present
# When a node is deployed with overcloud-minimal, OVS isn't required so let's
# ignore the case where the package can't be found (e.g. missing subscription).
# https://bugzilla.redhat.com/show_bug.cgi?id=1820306
failed_when:
- (ansible_facts['distribution'] | lower) == 'redhat'
- not ansible_check_mode | bool
- (edpm_bootstrap_packages_bootstrap_result.rc | int) == 1
- not ('No package openvswitch available.' in edpm_bootstrap_packages_bootstrap_result.failures | default([]))
register: edpm_bootstrap_packages_bootstrap_result
until: edpm_bootstrap_packages_bootstrap_result.rc == 0
retries: "{{ edpm_bootstrap_download_retries }}"
Expand Down

0 comments on commit 85586df

Please sign in to comment.