Skip to content

Yoga bump repos 310822 #184

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

Merged
merged 3 commits into from
Oct 10, 2022
Merged

Yoga bump repos 310822 #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ef2332
Bump repos to the same versions as Wallaby
mnasiadka Oct 7, 2022
b1d0ed1
Merge stackhpc/wallaby into stackhpc/xena
markgoddard Oct 5, 2022
f3f9dc0
Merge pull request #174 from stackhpc/xena_deps
markgoddard Oct 5, 2022
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
4 changes: 1 addition & 3 deletions etc/kayobe/ansible/requirements.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
---
collections:
- name: stackhpc.cephadm
version: 1.7.0
version: 1.10.0
- name: stackhpc.pulp
version: 0.3.0
- name: pulp.squeezer
version: 0.0.11
45 changes: 33 additions & 12 deletions etc/kayobe/kolla.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,23 +249,44 @@ kolla_build_customizations_common:
kolla_build_customizations_centos:
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:
- ovn-2021-21.12.0
- ovn22.06
ovn_controller_packages_override:
- ovn-2021-host-21.12.0
- ovn22.06-host
ovn_nb_db_server_packages_override:
- ovn-2021-central-21.12.0
- ovn22.06-central
ovn_northd_packages_override:
- ovn-2021-central-21.12.0
- ovn22.06-central
ovn_sb_db_server_packages_override:
- ovn-2021-central-21.12.0
openvswitch_base_packages_override:
- libibverbs
- openvswitch2.16
- openvswitch-selinux-extra-policy
- python3-netifaces
- python3-openvswitch2.16
- tcpdump
- ovn22.06-central
openvswitch_base_packages_remove:
- openvswitch
- python3-openvswitch
openvswitch_base_packages_append:
- openvswitch2.17
- python3-openvswitch2.17

kolla_build_customizations_ubuntu: {}

Expand Down
2 changes: 1 addition & 1 deletion etc/kayobe/pulp-repo-versions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ stackhpc_pulp_repo_docker_version: 20220828T050510
stackhpc_pulp_repo_elasticsearch_logstash_kibana_7_x_version: 20220825T041159
stackhpc_pulp_repo_epel_modular_version: 20220828T050510
stackhpc_pulp_repo_epel_version: 20220830T054227
stackhpc_pulp_repo_grafana_version: 20220824T113700
stackhpc_pulp_repo_grafana_version: 20220831T050502
stackhpc_pulp_repo_mariadb_10_6_centos8_version: 20220819T111114
stackhpc_pulp_repo_rabbitmq_erlang_version: 20220828T050510
stackhpc_pulp_repo_rabbitmq_server_version: 20220803T043053
Expand Down
5 changes: 4 additions & 1 deletion etc/kayobe/seed.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,10 @@ seed_squid_container:
#
seed_containers: >-
{{ {} | combine(seed_pulp_container if seed_pulp_container_enabled | bool else {})
| combine(seed_squid_container if seed_squid_container_enabled | bool else {}) }}
| combine(seed_squid_container if seed_squid_container_enabled | bool else {})
| combine(seed_extra_containers) }}

seed_extra_containers: {}

###############################################################################
# Seed node firewalld configuration.
Expand Down