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.

Sign up for GitHub

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

Remove kolla_build_customizations_rocky defaults in Zed. #638

Closed
wants to merge 2 commits into from
Closed

Remove kolla_build_customizations_rocky defaults in Zed. #638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6730367
Remove kolla_build_customizations_rocky defaults
assumptionsandg Sep 13, 2023
7895d9a
Bump kolla tags
assumptionsandg Sep 14, 2023
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
42 changes: 1 addition & 41 deletions etc/kayobe/kolla.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,47 +277,7 @@ kolla_build_customizations_common:
ironic_inspector_pip_packages_append:
- /additions/*

kolla_build_customizations_rocky: # TODO: Check whether this is actually correct. It seems that it was previously being skipped for rocky
base_yum_repo_files_remove:
- proxysql.repo
neutron_base_packages_remove:
- openvswitch
- python3-openvswitch
neutron_base_packages_append:
- openvswitch2.17
- python3-openvswitch2.17
nova_base_packages_remove:
- openvswitch
- python3-openvswitch
nova_base_packages_append:
- openvswitch2.17
- python3-openvswitch2.17
nova_compute_packages_remove:
- openvswitch
nova_compute_packages_append:
- openvswitch2.17
octavia_base_packages_remove:
- openvswitch
- python3-openvswitch
octavia_base_packages_append:
- openvswitch2.17
- python3-openvswitch2.17
ovn_base_packages_override:
- ovn22.09
ovn_controller_packages_override:
- ovn22.09-host
ovn_nb_db_server_packages_override:
- ovn22.09-central
ovn_northd_packages_override:
- ovn22.09-central
ovn_sb_db_server_packages_override:
- ovn22.09-central
openvswitch_base_packages_remove:
- openvswitch
- python3-openvswitch
openvswitch_base_packages_append:
- openvswitch2.17
- python3-openvswitch2.17
kolla_build_customizations_rocky: {}

kolla_build_customizations_ubuntu: {}

Expand Down
20 changes: 20 additions & 0 deletions etc/kayobe/kolla/globals.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,28 @@ kayobe_image_tags:
openstack:
rocky: zed-rocky-9-20230821T155947
ubuntu: zed-ubuntu-jammy-20230821T155947
neutron:
rocky: zed-rocky-9-20230921T112227
ubuntu: zed-ubuntu-jammy-20230821T155947
nova:
rocky: zed-rocky-9-20230921T112227
ubuntu: zed-ubuntu-jammy-20230821T155947
octavia:
rocky: zed-rocky-9-20230921T112227
ubuntu: zed-ubuntu-jammy-20230821T155947
ovn:
rocky: zed-rocky-9-20230921T112227
ubuntu: zed-ubuntu-jammy-20230821T155947
openvswitch:
rocky: zed-rocky-9-20230921T112227
ubuntu: zed-ubuntu-jammy-20230821T155947

openstack_tag: "{% raw %}{{ kayobe_image_tags['openstack'][kolla_base_distro] }}{% endraw %}"
neutron_tag: "{% raw %}{{ kayobe_image_tags['neutron'][kolla_base_distro] }}{% endraw %}"
nova_tag: "{% raw %}{{ kayobe_image_tags['nova'][kolla_base_distro] }}{% endraw %}"
octavia_tag: "{% raw %}{{ kayobe_image_tags['octavia'][kolla_base_distro] }}{% endraw %}"
ovn_tag: "{% raw %}{{ kayobe_image_tags['ovn'][kolla_base_distro] }}{% endraw %}"
openvswitch_tag: "{% raw %}{{ kayobe_image_tags['openvswitch'][kolla_base_distro] }}{% endraw %}"

om_enable_rabbitmq_high_availability: true

Expand Down