Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use rdo|rhoso-openvswitch wrapper to pin versions #507

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading