From 4ef2332ff15c4bad209b865aa77ffab53b0d308e Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Fri, 7 Oct 2022 10:53:28 +0200 Subject: [PATCH 1/3] Bump repos to the same versions as Wallaby --- etc/kayobe/pulp-repo-versions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml index 2cd84e001..e158c24a0 100644 --- a/etc/kayobe/pulp-repo-versions.yml +++ b/etc/kayobe/pulp-repo-versions.yml @@ -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 From b1d0ed18d2665402d78aecf45b4ba6ec61926bb8 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 5 Oct 2022 13:33:03 +0100 Subject: [PATCH 2/3] Merge stackhpc/wallaby into stackhpc/xena --- etc/kayobe/kolla.yml | 45 ++++++++++++++++++++++++++++++++------------ etc/kayobe/seed.yml | 5 ++++- 2 files changed, 37 insertions(+), 13 deletions(-) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 90746020b..d34e4b9aa 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -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: {} diff --git a/etc/kayobe/seed.yml b/etc/kayobe/seed.yml index bcbec5556..ce16140fa 100644 --- a/etc/kayobe/seed.yml +++ b/etc/kayobe/seed.yml @@ -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. From f3f9dc08df653cb8e2fa7cd33e63d0de6064de96 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 5 Oct 2022 16:28:06 +0100 Subject: [PATCH 3/3] Merge pull request #174 from stackhpc/xena_deps Xena: Ansible dependencies --- etc/kayobe/ansible/requirements.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/etc/kayobe/ansible/requirements.yml b/etc/kayobe/ansible/requirements.yml index 52b18f408..99a0c83f7 100644 --- a/etc/kayobe/ansible/requirements.yml +++ b/etc/kayobe/ansible/requirements.yml @@ -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