Skip to content

Commit

Permalink
Use rdo|rhoso-openvswitch wrapper to pin versions
Browse files Browse the repository at this point in the history
If openvswitch3.N is pinned, rdo-openvswitch is still upgraded, which
replaces openvswitch3.N with openvswitch.N+1. But if the wrapper is
pinned, then it doesn't.
  • Loading branch information
booxter committed Jul 2, 2024
1 parent f7e3da5 commit 2b87d85
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,12 @@ endif::[]
# Do not attempt OVS major upgrades here
edpm_ovs_packages:
- openvswitch3.1
ifeval::["{build}" == "downstream"]
- rhoso-openvswitch-3.1
endif::[]
ifeval::["{build}" != "downstream"]
- rdo-openvswitch-3.1
endif::[]
EOF
----
+
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,12 @@ endif::[]
# Do not attempt OVS major upgrades here
edpm_ovs_packages:
- openvswitch3.1
ifeval::["{build}" == "downstream"]
- rhoso-openvswitch-3.1
endif::[]
ifeval::["{build}" != "downstream"]
- rdo-openvswitch-3.1
endif::[]
EOF
----

Expand Down
2 changes: 1 addition & 1 deletion tests/roles/dataplane_adoption/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@
# Do not attempt OVS major upgrades here
edpm_ovs_packages:
- openvswitch3.1
- {{ distribution }}-openvswitch-3.1
# ovn-controller settings
edpm_ovn_bridge_mappings: ["datacentre:{{ neutron_physical_bridge_name }}"]
Expand Down
3 changes: 3 additions & 0 deletions tests/vars.sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,6 @@ run_pre_adoption_validation: true

# Whether the adopted node will host compute services
compute_adoption: true

# Distribution to use for the adopted node. Supported values are 'rdo' and 'rhoso'.
distribution: rdo

0 comments on commit 2b87d85

Please sign in to comment.