From b9746b12ee9375b5846d5c6a3c2fc2001bd8db68 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Wed, 31 Aug 2022 20:11:52 +0100 Subject: [PATCH 01/32] Adds Rocky 8 repository config for local pulp (#146) * Adds Rocky 8 repository config for local pulp We support Rocky 8 as a host OS with os_distribution == 'rocky'. This adds the configuration necessary to use the RPM snapshots from ark. * Abstract over version number v1 Unsure if it would be better to: 1) Update the remote on the repository 2) Change the publication to point to a new repository and keep repositories for every minor version Advantages of 1: - Single repository in pulp Advantages of 2: - Less chance of conflicts (although I think an old repo is just an old snapshot) * Fixups * Address code review comment Upadting variable name after feedback --- etc/kayobe/pulp-repo-versions.yml | 5 ++ etc/kayobe/pulp.yml | 129 +++++++++++++++++++++++++++--- 2 files changed, 125 insertions(+), 9 deletions(-) diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml index 7f5398601..a4c8cf6f4 100644 --- a/etc/kayobe/pulp-repo-versions.yml +++ b/etc/kayobe/pulp-repo-versions.yml @@ -23,3 +23,8 @@ stackhpc_pulp_repo_treasuredata_4_version: 20220429T160649 stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20220804T040153 stackhpc_pulp_repo_ubuntu_focal_security_version: 20220804T040153 stackhpc_pulp_repo_ubuntu_focal_version: 20220804T040153 +stackhpc_pulp_repo_rocky_8_6_appstream_version: "20220606T111205" +stackhpc_pulp_repo_rocky_8_6_baseos_version: "20220606T111205" +stackhpc_pulp_repo_rocky_8_6_extras_version: "20220606T111205" +stackhpc_pulp_repo_rocky_8_6_nfv_version: "20220606T111205" +stackhpc_pulp_repo_rocky_8_6_powertools_version: "20220606T111205" diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml index 7efec2735..2ec7b9762 100644 --- a/etc/kayobe/pulp.yml +++ b/etc/kayobe/pulp.yml @@ -167,6 +167,21 @@ stackhpc_pulp_distribution_deb_production: # Whether to sync CentOS Stream 8 packages. stackhpc_pulp_sync_centos_stream8: "{{ os_distribution == 'centos' }}" +# Whether to sync Rocky Linux 8 packages. +stackhpc_pulp_sync_rocky_8: "{{ os_distribution == 'rocky' }}" +# Rocky 8 minor version number. Supported values: 6. +stackhpc_pulp_repo_rocky_8_minor_version: 6 +# Rocky 8 Snapshot versions. The defaults use the appropriate version from +# pulp-repo-versions.yml for the selected minor release. +stackhpc_pulp_repo_rocky_8_appstream_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_8_%s_appstream_version' % stackhpc_pulp_repo_rocky_8_minor_version) }}" +stackhpc_pulp_repo_rocky_8_baseos_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_8_%s_baseos_version' % stackhpc_pulp_repo_rocky_8_minor_version) }}" +stackhpc_pulp_repo_rocky_8_extras_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_8_%s_extras_version' % stackhpc_pulp_repo_rocky_8_minor_version) }}" +stackhpc_pulp_repo_rocky_8_nfv_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_8_%s_nfv_version' % stackhpc_pulp_repo_rocky_8_minor_version) }}" +stackhpc_pulp_repo_rocky_8_powertools_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_8_%s_powertools_version' % stackhpc_pulp_repo_rocky_8_minor_version) }}" + +# Whether to sync packages common to all RHEL derivatives. +stackhpc_pulp_sync_el_8: "{{ stackhpc_pulp_sync_rocky_8 or stackhpc_pulp_sync_centos_stream8 }}" + stackhpc_pulp_repository_rpm_repos: # Base CentOS 8 Stream repositories - name: CentOS Stream 8 - AppStream @@ -194,6 +209,48 @@ stackhpc_pulp_repository_rpm_repos: state: present required: "{{ stackhpc_pulp_sync_centos_stream8 | bool }}" + # Base Rocky 8 repositories + - name: Rocky Linux 8 - AppStream + url: "{{ stackhpc_release_pulp_content_url }}/rocky/8.{{ stackhpc_pulp_repo_rocky_8_minor_version }}/AppStream/x86_64/os/{{ stackhpc_pulp_repo_rocky_8_appstream_version }}" + client_cert: "{{ stackhpc_release_pulp_client_cert }}" + client_key: "{{ stackhpc_release_pulp_client_key }}" + policy: on_demand + sync_policy: mirror_complete + state: present + required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" + - name: Rocky Linux 8 - BaseOS + url: "{{ stackhpc_release_pulp_content_url }}/rocky/8.{{ stackhpc_pulp_repo_rocky_8_minor_version }}/BaseOS/x86_64/os/{{ stackhpc_pulp_repo_rocky_8_baseos_version }}" + client_cert: "{{ stackhpc_release_pulp_client_cert }}" + client_key: "{{ stackhpc_release_pulp_client_key }}" + policy: on_demand + sync_policy: mirror_complete + state: present + required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" + - name: Rocky Linux 8 - Extras + url: "{{ stackhpc_release_pulp_content_url }}/rocky/8.{{ stackhpc_pulp_repo_rocky_8_minor_version }}/extras/x86_64/os/{{ stackhpc_pulp_repo_rocky_8_extras_version }}" + client_cert: "{{ stackhpc_release_pulp_client_cert }}" + client_key: "{{ stackhpc_release_pulp_client_key }}" + policy: on_demand + sync_policy: mirror_complete + state: present + required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" + - name: Rocky Linux 8 - NFV + url: "{{ stackhpc_release_pulp_content_url }}/rocky/8.{{ stackhpc_pulp_repo_rocky_8_minor_version }}/nfv/x86_64/os/{{ stackhpc_pulp_repo_rocky_8_nfv_version }}" + client_cert: "{{ stackhpc_release_pulp_client_cert }}" + client_key: "{{ stackhpc_release_pulp_client_key }}" + policy: on_demand + sync_policy: mirror_complete + state: present + required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" + - name: Rocky Linux 8 - PowerTools + url: "{{ stackhpc_release_pulp_content_url }}/rocky/8.{{ stackhpc_pulp_repo_rocky_8_minor_version }}/PowerTools/x86_64/os/{{ stackhpc_pulp_repo_rocky_8_6_powertools_version }}" + client_cert: "{{ stackhpc_release_pulp_client_cert }}" + client_key: "{{ stackhpc_release_pulp_client_key }}" + policy: on_demand + sync_policy: mirror_complete + state: present + required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" + # EPEL repositories - name: Extra Packages for Enterprise Linux 8 - x86_64 url: "{{ stackhpc_release_pulp_content_url }}/epel/8/Everything/x86_64/{{ stackhpc_pulp_repo_epel_version }}" @@ -202,7 +259,7 @@ stackhpc_pulp_repository_rpm_repos: policy: on_demand sync_policy: mirror_content_only state: present - required: "{{ stackhpc_pulp_sync_centos_stream8 | bool }}" + required: "{{ stackhpc_pulp_sync_el_8 | bool }}" - name: Extra Packages for Enterprise Linux Modular 8 - x86_64 url: "{{ stackhpc_release_pulp_content_url }}/epel/8/Modular/x86_64/{{ stackhpc_pulp_repo_epel_modular_version }}" client_cert: "{{ stackhpc_release_pulp_client_cert }}" @@ -210,7 +267,7 @@ stackhpc_pulp_repository_rpm_repos: policy: on_demand sync_policy: mirror_complete state: present - required: "{{ stackhpc_pulp_sync_centos_stream8 | bool }}" + required: "{{ stackhpc_pulp_sync_el_8 | bool }}" # Third-party repositories - name: Docker CE for CentOS 8 @@ -220,7 +277,7 @@ stackhpc_pulp_repository_rpm_repos: policy: on_demand sync_policy: mirror_complete state: present - required: "{{ stackhpc_pulp_sync_centos_stream8 | bool }}" + required: "{{ stackhpc_pulp_sync_el_8 }}" # Publication format is a subset of distribution. stackhpc_pulp_publication_rpm_development: "{{ stackhpc_pulp_distribution_rpm_development }}" @@ -247,24 +304,51 @@ stackhpc_pulp_distribution_rpm_development: state: present required: "{{ stackhpc_pulp_sync_centos_stream8 | bool }}" + # Base Rocky 8 repositories + - name: "rocky-8-appstream-development" + repository: Rocky Linux 8 - AppStream + base_path: "rocky/8/AppStream/x86_64/os/development" + state: present + required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" + - name: "rocky-8-baseos-development" + repository: Rocky Linux 8 - BaseOS + base_path: "rocky/8/BaseOS/x86_64/os/development" + state: present + required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" + - name: "rocky-8-extras-development" + repository: Rocky Linux 8 - Extras + base_path: "rocky/8/extras/x86_64/os/development" + state: present + required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" + - name: "rocky-8-nfv-development" + repository: Rocky Linux 8 - NFV + base_path: "rocky/8/nfv/x86_64/os/development" + state: present + required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" + - name: "rocky-powertools-development" + repository: Rocky Linux 8 - PowerTools + base_path: "rocky/8/PowerTools/x86_64/os/development" + state: present + required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" + # EPEL repositories - name: "extra-packages-for-enterprise-linux-8-x86_64-development" repository: Extra Packages for Enterprise Linux 8 - x86_64 base_path: "epel/8/Everything/x86_64/development" state: present - required: "{{ stackhpc_pulp_sync_centos_stream8 | bool }}" + required: "{{ stackhpc_pulp_sync_el_8 | bool }}" - name: "extra-packages-for-enterprise-linux-modular-8-x86_64-development" repository: Extra Packages for Enterprise Linux Modular 8 - x86_64 base_path: "epel/8/Modular/x86_64/development" state: present - required: "{{ stackhpc_pulp_sync_centos_stream8 | bool }}" + required: "{{ stackhpc_pulp_sync_el_8 | bool }}" # Third-party repositories - name: "docker-ce-for-centos-8-development" repository: Docker CE for CentOS 8 base_path: "docker-ce/centos/8/x86_64/stable/development" state: present - required: "{{ stackhpc_pulp_sync_centos_stream8 | bool }}" + required: "{{ stackhpc_pulp_sync_el_8 | bool }}" # Development gets promoted to production. stackhpc_pulp_distribution_rpm_production: @@ -285,24 +369,51 @@ stackhpc_pulp_distribution_rpm_production: state: present required: "{{ stackhpc_pulp_sync_centos_stream8 | bool }}" + # Base Rocky 8 repositories + - name: "rocky-8-appstream-production" + distribution: "rocky-8-appstream-development" + base_path: "rocky/8/AppStream/x86_64/os/production" + state: present + required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" + - name: "rocky-8-baseos-production" + distribution: "rocky-8-baseos-development" + base_path: "rocky/8/BaseOS/x86_64/os/production" + state: present + required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" + - name: "rocky-8-extras-production" + distribution: "rocky-8-extras-development" + base_path: "rocky/8/extras/x86_64/os/production" + state: present + required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" + - name: "rocky-8-nfv-production" + distribution: "rocky-8-nfv-development" + base_path: "rocky/8/nfv/x86_64/os/production" + state: present + required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" + - name: "rocky-8-powertools-production" + distribution: "rocky-8-powertools-development" + base_path: "rocky/8/PowerTools/x86_64/os/production" + state: present + required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" + # EPEL repositories - name: "extra-packages-for-enterprise-linux-8-x86_64-production" base_path: "epel/8/Everything/x86_64/production" distribution: "extra-packages-for-enterprise-linux-8-x86_64-development" state: present - required: "{{ stackhpc_pulp_sync_centos_stream8 | bool }}" + required: "{{ stackhpc_pulp_sync_el_8 | bool }}" - name: "extra-packages-for-enterprise-linux-modular-8-x86_64-production" base_path: "epel/8/Modular/x86_64/production" distribution: "extra-packages-for-enterprise-linux-modular-8-x86_64-development" state: present - required: "{{ stackhpc_pulp_sync_centos_stream8 | bool }}" + required: "{{ stackhpc_pulp_sync_el_8 | bool }}" # Third-party repositories - name: "docker-ce-for-centos-8-production" base_path: "docker-ce/centos/8/x86_64/stable/production" distribution: "docker-ce-for-centos-8-development" state: present - required: "{{ stackhpc_pulp_sync_centos_stream8 | bool }}" + required: "{{ stackhpc_pulp_sync_el_8 | bool }}" ############################################################################### # Containers From 422be9f0d581d9caa0d161b6c54c90147feb7e4f Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Thu, 1 Sep 2022 10:56:15 +0100 Subject: [PATCH 02/32] Update docker baseurl to work with Rocky 8 (#153) This is the equivalent change of: https://review.opendev.org/c/openstack/ansible-collection-kolla/+/831642 --- etc/kayobe/kolla/globals.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index 3c0906229..79f05f90c 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -1,7 +1,7 @@ # yamllint disable-file --- docker_yum_baseurl: "{{ stackhpc_repo_docker_url }}" -docker_yum_gpgkey: "https://download.docker.com/linux/{% raw %}{{ ansible_facts.distribution | lower }}{% endraw %}/gpg" +docker_yum_gpgkey: "https://download.docker.com/linux/centos/gpg" {% if kolla_base_distro == 'centos' %} barbican_tag: xena-20220728T143658 From c23604d04060f84ae35731c1a97f7148d4662214 Mon Sep 17 00:00:00 2001 From: Grzegorz Koper Date: Wed, 14 Sep 2022 12:08:40 +0200 Subject: [PATCH 03/32] Adding seed_extra_containers to support redfish and wireguard --- etc/kayobe/seed.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etc/kayobe/seed.yml b/etc/kayobe/seed.yml index 3de3e3872..2d0784136 100644 --- a/etc/kayobe/seed.yml +++ b/etc/kayobe/seed.yml @@ -131,7 +131,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 11bf9fcb21d4e937fa15f96929a08de0f2eef896 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Tue, 20 Sep 2022 17:10:54 +0100 Subject: [PATCH 04/32] cephadm: Bump collection to 1.8.0 This fixes several issues. https://github.com/stackhpc/ansible-collection-cephadm/releases/tag/1.8.0 --- etc/kayobe/ansible/requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/kayobe/ansible/requirements.yml b/etc/kayobe/ansible/requirements.yml index 52b18f408..a00fa1efc 100644 --- a/etc/kayobe/ansible/requirements.yml +++ b/etc/kayobe/ansible/requirements.yml @@ -1,7 +1,7 @@ --- collections: - name: stackhpc.cephadm - version: 1.7.0 + version: 1.8.0 - name: stackhpc.pulp version: 0.3.0 - name: pulp.squeezer From e90ade1e0778e86b0fa63c7cacbe2449272eb8a8 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Tue, 20 Sep 2022 17:11:14 +0100 Subject: [PATCH 05/32] cephadm: use admin overcloud network for SSH access --- etc/kayobe/cephadm.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/etc/kayobe/cephadm.yml b/etc/kayobe/cephadm.yml index eff49c565..b82111cb7 100644 --- a/etc/kayobe/cephadm.yml +++ b/etc/kayobe/cephadm.yml @@ -23,6 +23,9 @@ cephadm_registry_username: "{{ stackhpc_docker_registry_username }}" # Ceph container image registry password. cephadm_registry_password: "{{ stackhpc_docker_registry_password }}" +# Cephadm admin network interface. +cephadm_admin_interface: "{{ admin_oc_net_name | net_interface }}" + # Ceph public network interface. cephadm_public_interface: "{{ storage_net_name | net_interface }}" From 33172bebec2ffdc2c2702aa46bda50a0c7b5eb1a Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Tue, 20 Sep 2022 17:12:03 +0100 Subject: [PATCH 06/32] cephadm: sync only a specific container image tag Syncing all tags in quay.io/ceph/ceph can take a long time, and may even fail before getting to the tag we're interested in. --- etc/kayobe/pulp.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml index 2ec7b9762..5805dc92a 100644 --- a/etc/kayobe/pulp.yml +++ b/etc/kayobe/pulp.yml @@ -597,6 +597,7 @@ stackhpc_pulp_repository_container_repos_ceph: url: "https://quay.io" policy: on_demand state: present + include_tags: "{{ cephadm_image_tag }}" required: "{{ stackhpc_sync_ceph_images | bool }}" # List of Ceph container image distributions. From 608d42364cb186c342d3b8b7eadb846075eec4e9 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Wed, 21 Sep 2022 09:31:07 +0200 Subject: [PATCH 07/32] Prevent failures when dhclient is not running --- terraform/aio/scripts/configure-local-networking.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/aio/scripts/configure-local-networking.sh b/terraform/aio/scripts/configure-local-networking.sh index 0b4869bc3..c7bd70bf8 100644 --- a/terraform/aio/scripts/configure-local-networking.sh +++ b/terraform/aio/scripts/configure-local-networking.sh @@ -55,4 +55,4 @@ if ! sudo ip a show dev breth1 | grep $public_ip/24 >/dev/null 2>&1; then fi # This prevents network.service from restarting correctly. -sudo killall dhclient +sudo killall dhclient || true From 8abcbc9b613553b3880ca9d24f7e3ea8ea910ad6 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 21 Sep 2022 10:39:54 +0100 Subject: [PATCH 08/32] Cephadm: Remove leading tabs from generated ceph.conf --- etc/kayobe/ansible/cephadm-gather-keys.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/etc/kayobe/ansible/cephadm-gather-keys.yml b/etc/kayobe/ansible/cephadm-gather-keys.yml index d73f15a9e..4f0330deb 100644 --- a/etc/kayobe/ansible/cephadm-gather-keys.yml +++ b/etc/kayobe/ansible/cephadm-gather-keys.yml @@ -64,7 +64,8 @@ - name: Save ceph.conf to Kayobe configuration copy: - content: "{{ cephadm_ceph_conf.stdout }}" + # Kolla Ansible's merge_configs module does not like the leading tabs in ceph.conf. + content: "{{ cephadm_ceph_conf.stdout | regex_replace('\\t') }}" dest: "{{ kayobe_env_config_path }}/kolla/config/{{ kolla_service_to_conf_dir[item.0.name] }}/ceph.conf" loop: "{{ query('subelements', kolla_ceph_services | selectattr('required'), 'keys') }}" loop_control: From 65ca43407b776290df294a5aba1226d07285de3d Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 21 Sep 2022 12:29:26 +0100 Subject: [PATCH 09/32] Cephadm: Fix keyring generation Previously only the key was included, but we need the full file including caps. --- etc/kayobe/ansible/cephadm-gather-keys.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/etc/kayobe/ansible/cephadm-gather-keys.yml b/etc/kayobe/ansible/cephadm-gather-keys.yml index 4f0330deb..bfaeaaf32 100644 --- a/etc/kayobe/ansible/cephadm-gather-keys.yml +++ b/etc/kayobe/ansible/cephadm-gather-keys.yml @@ -25,6 +25,7 @@ - name: Get Ceph keys stackhpc.cephadm.cephadm_key: name: "{{ item }}" + output_format: plain state: info register: cephadm_key_info become: true @@ -49,10 +50,12 @@ - name: Save Ceph keys to Kayobe configuration vars: key_info: "{{ cephadm_key_info.results | selectattr('item', 'equalto', item.1) | first }}" - cephadm_key: "{{ (key_info.stdout | from_json | first)['key'] }}" - cephadm_user: "{{ (key_info.stdout | from_json | first)['entity'] }}" + cephadm_key: "{{ key_info.stdout }}" + cephadm_user: "{{ item.1 }}" copy: - content: "{{ cephadm_key }}" + # Include a trailing newline. + content: | + {{ cephadm_key }} dest: "{{ kayobe_env_config_path }}/kolla/config/{{ kolla_service_to_key_dir[item.0.name] }}/ceph.{{ cephadm_user }}.keyring" loop: "{{ query('subelements', kolla_ceph_services | selectattr('required'), 'keys') }}" loop_control: From 58e2fe2de28b3e854ce348823509ae5e63f1a737 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Thu, 1 Sep 2022 07:58:06 +0200 Subject: [PATCH 10/32] Bump pulp-repo-versions to latest of 1st Sep 22 --- etc/kayobe/pulp-repo-versions.yml | 34 +++++++++++++++---------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml index f0dfdca8c..2d58f2af8 100644 --- a/etc/kayobe/pulp-repo-versions.yml +++ b/etc/kayobe/pulp-repo-versions.yml @@ -1,24 +1,24 @@ --- # Do not edit! This file is autogenerated by Ansible. -stackhpc_pulp_repo_centos_8_opstools_version: 20211122T102435 -stackhpc_pulp_repo_centos_8_storage_ceph_nautilus_version: 20211122T102435 +stackhpc_pulp_repo_centos_8_opstools_version: 20220617T100837 +stackhpc_pulp_repo_centos_8_storage_ceph_nautilus_version: 20220617T100837 stackhpc_pulp_repo_centos_stream_8_advanced_virtualization_version: 20211122T102435 -stackhpc_pulp_repo_centos_stream_8_appstream_version: 20211122T102435 -stackhpc_pulp_repo_centos_stream_8_baseos_version: 20211122T102435 -stackhpc_pulp_repo_centos_stream_8_extras_version: 20211122T102435 -stackhpc_pulp_repo_centos_stream_8_nfv_openvswitch_version: 20220622T042524 -stackhpc_pulp_repo_centos_stream_8_openstack_wallaby_version: 20211122T102435 -stackhpc_pulp_repo_centos_stream_8_powertools_version: 20211122T102435 -stackhpc_pulp_repo_centos_stream_8_storage_ceph_pacific_version: 20211210T124731 +stackhpc_pulp_repo_centos_stream_8_appstream_version: 20220817T082321 +stackhpc_pulp_repo_centos_stream_8_baseos_version: 20220817T082321 +stackhpc_pulp_repo_centos_stream_8_extras_version: 20220401T032901 +stackhpc_pulp_repo_centos_stream_8_nfv_openvswitch_version: 20220824T113700 +stackhpc_pulp_repo_centos_stream_8_openstack_wallaby_version: 20220831T050502 +stackhpc_pulp_repo_centos_stream_8_powertools_version: 20220817T082321 +stackhpc_pulp_repo_centos_stream_8_storage_ceph_pacific_version: 20220803T043053 stackhpc_pulp_repo_docker_ce_ubuntu_version: 20220708T132615 -stackhpc_pulp_repo_docker_version: 20211122T102435 -stackhpc_pulp_repo_elasticsearch_logstash_kibana_7_x_version: 20211122T102435 -stackhpc_pulp_repo_epel_modular_version: 20211122T102435 -stackhpc_pulp_repo_epel_version: 20211122T102435 -stackhpc_pulp_repo_grafana_version: 20220119T030911 -stackhpc_pulp_repo_rabbitmq_erlang_version: 20211122T102435 -stackhpc_pulp_repo_rabbitmq_server_version: 20211122T102435 -stackhpc_pulp_repo_treasuredata_4_version: 20211122T102435 +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: 20220831T050502 +stackhpc_pulp_repo_rabbitmq_erlang_version: 20220828T050510 +stackhpc_pulp_repo_rabbitmq_server_version: 20220803T043053 +stackhpc_pulp_repo_treasuredata_4_version: 20220823T042339 stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20220804T040153 stackhpc_pulp_repo_ubuntu_focal_security_version: 20220804T040153 stackhpc_pulp_repo_ubuntu_focal_version: 20220804T040153 From 1f56388030fa0d9b38dc7a154c9f6ca917f60895 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Thu, 1 Sep 2022 09:06:32 +0200 Subject: [PATCH 11/32] Bump OVN to 22.06 and OVS to 2.17 --- etc/kayobe/kolla.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 2f19fb75d..43aae1f9f 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -258,21 +258,21 @@ kolla_build_customizations_common: kolla_build_customizations_centos: 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 + - ovn22.06-central openvswitch_base_packages_override: - libibverbs - - openvswitch2.16 + - openvswitch2.17 - openvswitch-selinux-extra-policy - python3-netifaces - - python3-openvswitch2.16 + - python3-openvswitch2.17 - tcpdump kolla_build_customizations_ubuntu: {} From b602e67318e7ca5280d4a8ee321ce5523e105867 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Thu, 1 Sep 2022 09:12:41 +0200 Subject: [PATCH 12/32] opstools: update url to 8-stream instead of 8 --- etc/kayobe/stackhpc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/kayobe/stackhpc.yml b/etc/kayobe/stackhpc.yml index 1df3e19ae..8f6ac3f7d 100644 --- a/etc/kayobe/stackhpc.yml +++ b/etc/kayobe/stackhpc.yml @@ -68,7 +68,7 @@ stackhpc_repo_centos_stream_powertools_url: "{{ stackhpc_repo_mirror_url }}/pulp stackhpc_repo_centos_stream_powertools_version: "{{ stackhpc_repo_distribution }}" # CentOS 8 - OpsTools - collectd -stackhpc_repo_centos_opstools_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/8/opstools/x86_64/collectd-5/{{ stackhpc_repo_centos_opstools_version }}" +stackhpc_repo_centos_opstools_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/8-stream/opstools/x86_64/collectd-5/{{ stackhpc_repo_centos_opstools_version }}" stackhpc_repo_centos_opstools_version: "{{ stackhpc_repo_distribution }}" # CentOS Stream 8 - Ceph Pacific From 471281a913533fd690f87c693bfda6658a2494df Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Thu, 1 Sep 2022 10:30:31 +0100 Subject: [PATCH 13/32] opstools: fix all references to match xena --- etc/kayobe/environments/ci-aio/stackhpc-ci.yml | 2 +- etc/kayobe/environments/ci-builder/stackhpc-ci.yml | 2 +- etc/kayobe/kolla.yml | 4 ++-- etc/kayobe/pulp-repo-versions.yml | 2 +- etc/kayobe/stackhpc.yml | 8 ++++---- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/etc/kayobe/environments/ci-aio/stackhpc-ci.yml b/etc/kayobe/environments/ci-aio/stackhpc-ci.yml index b78339cdb..8e9ea16e5 100644 --- a/etc/kayobe/environments/ci-aio/stackhpc-ci.yml +++ b/etc/kayobe/environments/ci-aio/stackhpc-ci.yml @@ -29,8 +29,8 @@ stackhpc_repo_docker_version: "{{ stackhpc_pulp_repo_docker_version }}" stackhpc_repo_centos_stream_advanced_virtualization_version: "{{ stackhpc_pulp_repo_centos_stream_8_advanced_virtualization_version }}" stackhpc_repo_centos_stream_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_8_nfv_openvswitch_version }}" stackhpc_repo_centos_stream_openstack_wallaby_version: "{{ stackhpc_pulp_repo_centos_stream_8_openstack_wallaby_version }}" +stackhpc_repo_centos_stream_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_8_opstools_version }}" stackhpc_repo_centos_stream_powertools_version: "{{ stackhpc_pulp_repo_centos_stream_8_powertools_version }}" -stackhpc_repo_centos_opstools_version: "{{ stackhpc_pulp_repo_centos_8_opstools_version }}" stackhpc_repo_centos_stream_storage_ceph_pacific_version: "{{ stackhpc_pulp_repo_centos_stream_8_storage_ceph_pacific_version }}" stackhpc_repo_elasticsearch_logstash_kibana_7_x_version: "{{ stackhpc_pulp_repo_elasticsearch_logstash_kibana_7_x_version }}" stackhpc_repo_grafana_version: "{{ stackhpc_pulp_repo_grafana_version }}" diff --git a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml index 26d767d03..4fa1a998f 100644 --- a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml +++ b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml @@ -49,8 +49,8 @@ stackhpc_repo_docker_version: "{{ stackhpc_pulp_repo_docker_version }}" stackhpc_repo_centos_stream_advanced_virtualization_version: "{{ stackhpc_pulp_repo_centos_stream_8_advanced_virtualization_version }}" stackhpc_repo_centos_stream_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_8_nfv_openvswitch_version }}" stackhpc_repo_centos_stream_openstack_wallaby_version: "{{ stackhpc_pulp_repo_centos_stream_8_openstack_wallaby_version }}" +stackhpc_repo_centos_stream_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_8_opstools_version }}" stackhpc_repo_centos_stream_powertools_version: "{{ stackhpc_pulp_repo_centos_stream_8_powertools_version }}" -stackhpc_repo_centos_opstools_version: "{{ stackhpc_pulp_repo_centos_8_opstools_version }}" stackhpc_repo_centos_stream_storage_ceph_pacific_version: "{{ stackhpc_pulp_repo_centos_stream_8_storage_ceph_pacific_version }}" stackhpc_repo_elasticsearch_logstash_kibana_7_x_version: "{{ stackhpc_pulp_repo_elasticsearch_logstash_kibana_7_x_version }}" stackhpc_repo_grafana_version: "{{ stackhpc_pulp_repo_grafana_version }}" diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 43aae1f9f..8b47a5a8e 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -168,10 +168,10 @@ stackhpc_centos_additional_repos: file: "CentOS-NFV-OpenvSwitch.repo" - url: "{{ stackhpc_repo_centos_stream_openstack_wallaby_url }}" file: "CentOS-OpenStack-wallaby.repo" + - url: "{{ stackhpc_repo_centos_stream_opstools_url }}" + file: "CentOS-OpsTools.repo" - url: "{{ stackhpc_repo_centos_stream_powertools_url }}" file: "CentOS-Stream-PowerTools.repo" - - url: "{{ stackhpc_repo_centos_opstools_url }}" - file: "CentOS-OpsTools.repo" - url: "{{ stackhpc_repo_centos_stream_storage_ceph_pacific_url }}" file: "CentOS-Ceph-Pacific.repo" diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml index 2d58f2af8..c89a80131 100644 --- a/etc/kayobe/pulp-repo-versions.yml +++ b/etc/kayobe/pulp-repo-versions.yml @@ -1,6 +1,5 @@ --- # Do not edit! This file is autogenerated by Ansible. -stackhpc_pulp_repo_centos_8_opstools_version: 20220617T100837 stackhpc_pulp_repo_centos_8_storage_ceph_nautilus_version: 20220617T100837 stackhpc_pulp_repo_centos_stream_8_advanced_virtualization_version: 20211122T102435 stackhpc_pulp_repo_centos_stream_8_appstream_version: 20220817T082321 @@ -8,6 +7,7 @@ stackhpc_pulp_repo_centos_stream_8_baseos_version: 20220817T082321 stackhpc_pulp_repo_centos_stream_8_extras_version: 20220401T032901 stackhpc_pulp_repo_centos_stream_8_nfv_openvswitch_version: 20220824T113700 stackhpc_pulp_repo_centos_stream_8_openstack_wallaby_version: 20220831T050502 +stackhpc_pulp_repo_centos_stream_8_opstools_version: 20220617T100837 stackhpc_pulp_repo_centos_stream_8_powertools_version: 20220817T082321 stackhpc_pulp_repo_centos_stream_8_storage_ceph_pacific_version: 20220803T043053 stackhpc_pulp_repo_docker_ce_ubuntu_version: 20220708T132615 diff --git a/etc/kayobe/stackhpc.yml b/etc/kayobe/stackhpc.yml index 8f6ac3f7d..6da0ba3ee 100644 --- a/etc/kayobe/stackhpc.yml +++ b/etc/kayobe/stackhpc.yml @@ -63,14 +63,14 @@ stackhpc_repo_centos_stream_nfv_openvswitch_version: "{{ stackhpc_repo_distribut stackhpc_repo_centos_stream_openstack_wallaby_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/8-stream/cloud/x86_64/openstack-wallaby/{{ stackhpc_repo_centos_stream_openstack_wallaby_version }}" stackhpc_repo_centos_stream_openstack_wallaby_version: "{{ stackhpc_repo_distribution }}" +# CentOS Stream 8 - OpsTools - collectd +stackhpc_repo_centos_stream_opstools_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/8-stream/opstools/x86_64/collectd-5/{{ stackhpc_repo_centos_stream_opstools_version }}" +stackhpc_repo_centos_stream_opstools_version: "{{ stackhpc_repo_distribution }}" + # CentOS Stream 8 - PowerTools stackhpc_repo_centos_stream_powertools_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/8-stream/PowerTools/x86_64/os/{{ stackhpc_repo_centos_stream_powertools_version }}" stackhpc_repo_centos_stream_powertools_version: "{{ stackhpc_repo_distribution }}" -# CentOS 8 - OpsTools - collectd -stackhpc_repo_centos_opstools_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/8-stream/opstools/x86_64/collectd-5/{{ stackhpc_repo_centos_opstools_version }}" -stackhpc_repo_centos_opstools_version: "{{ stackhpc_repo_distribution }}" - # CentOS Stream 8 - Ceph Pacific stackhpc_repo_centos_stream_storage_ceph_pacific_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/8-stream/storage/x86_64/ceph-pacific/{{ stackhpc_repo_centos_stream_storage_ceph_pacific_version }}" stackhpc_repo_centos_stream_storage_ceph_pacific_version: "{{ stackhpc_repo_distribution }}" From 2aedd4aad5f523c632c3ed745a21cdd5af86190f Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Wed, 14 Sep 2022 10:12:07 +0200 Subject: [PATCH 14/32] Add new docker tag --- etc/kayobe/kolla.yml | 2 +- etc/kayobe/kolla/globals.yml | 46 ++++++++++++++++++------------------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 8b47a5a8e..792230c9d 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -91,7 +91,7 @@ kolla_docker_registry_password: "{{ stackhpc_docker_registry_password }}" # Kolla OpenStack release version. This should be a Docker image tag. # Default is {{ openstack_release }}. -kolla_openstack_release: "{% if kolla_base_distro == 'centos' %}wallaby-20211207T102718{% else %}wallaby-20220819T112725{% endif %}" +kolla_openstack_release: "{% if kolla_base_distro == 'centos' %}wallaby-20220905T105054{% else %}wallaby-20220819T112725{% endif %}" # Docker tag applied to built container images. Default is # {{ kolla_openstack_release }}. diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index 68c3951f7..5b43100c8 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -4,29 +4,29 @@ docker_yum_baseurl: "{{ stackhpc_repo_docker_url }}" docker_yum_gpgkey: "https://download.docker.com/linux/{% raw %}{{ ansible_facts.distribution | lower }}{% endraw %}/gpg" {% if kolla_base_distro == 'centos' %} -barbican_tag: wallaby-20220311T133847 -bifrost_tag: wallaby-20220825T103439 -cinder_tag: wallaby-20220309T083940 -cloudkitty_tag: wallaby-20220119T122428 -grafana_tag: wallaby-20220210T160332 -horizon_tag: wallaby-20220525T174700 -ironic_inspector_tag: wallaby-20220606T093448 -ironic_neutron_agent_tag: wallaby-20220412T124526 -ironic_pxe_tag: wallaby-20220216T152518 -magnum_tag: wallaby-20220603T085526 -manila_tag: wallaby-20211210T140839 -neutron_tag: wallaby-20220610T145122 -nova_tag: wallaby-20220328T103755 -octavia_tag: wallaby-20220524T085900 -ovn_tag: wallaby-20220223T143249 -openvswitch_tag: wallaby-20220223T143249 -prometheus_tag: wallaby-20220525T174700 -prometheus_jiralert_tag: wallaby-20220119T122428 -prometheus_libvirt_exporter_tag: wallaby-20220325T122042 -prometheus_msteams_tag: wallaby-20220119T122428 -prometheus_openstack_exporter_tag: wallaby-20220705T132206 -skydive_agent_tag: wallaby-20220817T151053 -skydive_analyzer_tag: wallaby-20220817T151053 +#barbican_tag: wallaby-20220311T133847 +#bifrost_tag: wallaby-20220825T103439 +#cinder_tag: wallaby-20220309T083940 +#cloudkitty_tag: wallaby-20220119T122428 +#grafana_tag: wallaby-20220210T160332 +#horizon_tag: wallaby-20220525T174700 +#ironic_inspector_tag: wallaby-20220606T093448 +#ironic_neutron_agent_tag: wallaby-20220412T124526 +#ironic_pxe_tag: wallaby-20220216T152518 +#magnum_tag: wallaby-20220603T085526 +#manila_tag: wallaby-20211210T140839 +#neutron_tag: wallaby-20220610T145122 +#nova_tag: wallaby-20220328T103755 +#octavia_tag: wallaby-20220524T085900 +#ovn_tag: wallaby-20220223T143249 +#openvswitch_tag: wallaby-20220223T143249 +#prometheus_tag: wallaby-20220525T174700 +#prometheus_jiralert_tag: wallaby-20220119T122428 +#prometheus_libvirt_exporter_tag: wallaby-20220325T122042 +#prometheus_msteams_tag: wallaby-20220119T122428 +#prometheus_openstack_exporter_tag: wallaby-20220705T132206 +#skydive_agent_tag: wallaby-20220817T151053 +#skydive_analyzer_tag: wallaby-20220817T151053 {% else %} bifrost_tag: wallaby-20220825T112231 {% endif %} From f8d6ad9232ad1db7d2463d140f3704b226c344ec Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Fri, 16 Sep 2022 09:51:03 +0200 Subject: [PATCH 15/32] Add OVS overrides to Nova/Neutron/Octavia --- etc/kayobe/kolla.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 792230c9d..304d688db 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -257,6 +257,24 @@ kolla_build_customizations_common: - /additions/* kolla_build_customizations_centos: + 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 + octavia_base_packages_remove: + - openvswitch + - python3-openvswitch + octavia_base_packages_append: + - openvswitch2.17 + - python3-openvswitch2.17 ovn_base_packages_override: - ovn22.06 ovn_controller_packages_override: From b3707e35919aad5e01634ad9774f19aa7eaa872e Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Fri, 16 Sep 2022 09:52:34 +0200 Subject: [PATCH 16/32] Adapt existing OVS customizations --- etc/kayobe/kolla.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 304d688db..910b35afe 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -285,13 +285,12 @@ kolla_build_customizations_centos: - ovn22.06-central ovn_sb_db_server_packages_override: - ovn22.06-central - openvswitch_base_packages_override: - - libibverbs + openvswitch_base_packages_remove: + - openvswitch + - python3-openvswitch + openvswitch_base_packages_append: - openvswitch2.17 - - openvswitch-selinux-extra-policy - - python3-netifaces - python3-openvswitch2.17 - - tcpdump kolla_build_customizations_ubuntu: {} From 93af0495aa28c1e2d971dab8308d207e3bb28baf Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Mon, 19 Sep 2022 10:05:08 +0200 Subject: [PATCH 17/32] Add ovs override for nova_compute --- etc/kayobe/kolla.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 910b35afe..960acd326 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -269,6 +269,10 @@ kolla_build_customizations_centos: 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 From 5246f2b0f5c9c4dfc593ebd30aeef4c053678db4 Mon Sep 17 00:00:00 2001 From: Grzegorz Koper Date: Wed, 21 Sep 2022 09:34:28 +0200 Subject: [PATCH 18/32] removing hashed tags --- etc/kayobe/kolla/globals.yml | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index 5b43100c8..c5761ff35 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -2,31 +2,3 @@ --- docker_yum_baseurl: "{{ stackhpc_repo_docker_url }}" docker_yum_gpgkey: "https://download.docker.com/linux/{% raw %}{{ ansible_facts.distribution | lower }}{% endraw %}/gpg" - -{% if kolla_base_distro == 'centos' %} -#barbican_tag: wallaby-20220311T133847 -#bifrost_tag: wallaby-20220825T103439 -#cinder_tag: wallaby-20220309T083940 -#cloudkitty_tag: wallaby-20220119T122428 -#grafana_tag: wallaby-20220210T160332 -#horizon_tag: wallaby-20220525T174700 -#ironic_inspector_tag: wallaby-20220606T093448 -#ironic_neutron_agent_tag: wallaby-20220412T124526 -#ironic_pxe_tag: wallaby-20220216T152518 -#magnum_tag: wallaby-20220603T085526 -#manila_tag: wallaby-20211210T140839 -#neutron_tag: wallaby-20220610T145122 -#nova_tag: wallaby-20220328T103755 -#octavia_tag: wallaby-20220524T085900 -#ovn_tag: wallaby-20220223T143249 -#openvswitch_tag: wallaby-20220223T143249 -#prometheus_tag: wallaby-20220525T174700 -#prometheus_jiralert_tag: wallaby-20220119T122428 -#prometheus_libvirt_exporter_tag: wallaby-20220325T122042 -#prometheus_msteams_tag: wallaby-20220119T122428 -#prometheus_openstack_exporter_tag: wallaby-20220705T132206 -#skydive_agent_tag: wallaby-20220817T151053 -#skydive_analyzer_tag: wallaby-20220817T151053 -{% else %} -bifrost_tag: wallaby-20220825T112231 -{% endif %} From c3ef4595cf284ab2db933423176811c227cc9602 Mon Sep 17 00:00:00 2001 From: Grzegorz Koper Date: Wed, 21 Sep 2022 10:47:11 +0200 Subject: [PATCH 19/32] Adding bifrost tag and logic, to build seed containers --- etc/kayobe/kolla/globals.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index c5761ff35..af1450a75 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -2,3 +2,8 @@ --- docker_yum_baseurl: "{{ stackhpc_repo_docker_url }}" docker_yum_gpgkey: "https://download.docker.com/linux/{% raw %}{{ ansible_facts.distribution | lower }}{% endraw %}/gpg" + +% if kolla_base_distro == 'centos' %} +bifrost_tag: wallaby-20220825T103439 +{% else %} +bifrost_tag: wallaby-20220825T112231 From 52e75e8fdd1a11180d7abee04c7ac15377704bf1 Mon Sep 17 00:00:00 2001 From: Grzegorz Koper Date: Wed, 21 Sep 2022 11:00:19 +0200 Subject: [PATCH 20/32] ending if statement --- etc/kayobe/kolla/globals.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index af1450a75..45b7b94f5 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -7,3 +7,4 @@ docker_yum_gpgkey: "https://download.docker.com/linux/{% raw %}{{ ansible_facts. bifrost_tag: wallaby-20220825T103439 {% else %} bifrost_tag: wallaby-20220825T112231 +{% endif %} From 9e5bdda5809cbb4feb864bbb696cecd3aa320aef Mon Sep 17 00:00:00 2001 From: Grzegorz Koper Date: Wed, 21 Sep 2022 12:02:19 +0200 Subject: [PATCH 21/32] syntax fix --- etc/kayobe/kolla/globals.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index 45b7b94f5..3feacd480 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -3,7 +3,7 @@ docker_yum_baseurl: "{{ stackhpc_repo_docker_url }}" docker_yum_gpgkey: "https://download.docker.com/linux/{% raw %}{{ ansible_facts.distribution | lower }}{% endraw %}/gpg" -% if kolla_base_distro == 'centos' %} +{% if kolla_base_distro == 'centos' %} bifrost_tag: wallaby-20220825T103439 {% else %} bifrost_tag: wallaby-20220825T112231 From 4b695f53326a555bf9c06dfba7ead9fdacb28734 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 21 Sep 2022 15:09:08 +0100 Subject: [PATCH 22/32] Ceph: add a trailing newline to ceph.conf --- etc/kayobe/ansible/cephadm-gather-keys.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/etc/kayobe/ansible/cephadm-gather-keys.yml b/etc/kayobe/ansible/cephadm-gather-keys.yml index bfaeaaf32..0a47de8d0 100644 --- a/etc/kayobe/ansible/cephadm-gather-keys.yml +++ b/etc/kayobe/ansible/cephadm-gather-keys.yml @@ -67,8 +67,10 @@ - name: Save ceph.conf to Kayobe configuration copy: + # Include a trailing newline. # Kolla Ansible's merge_configs module does not like the leading tabs in ceph.conf. - content: "{{ cephadm_ceph_conf.stdout | regex_replace('\\t') }}" + content: | + {{ cephadm_ceph_conf.stdout | regex_replace('\t') }} dest: "{{ kayobe_env_config_path }}/kolla/config/{{ kolla_service_to_conf_dir[item.0.name] }}/ceph.conf" loop: "{{ query('subelements', kolla_ceph_services | selectattr('required'), 'keys') }}" loop_control: From 49d8e80eeeccd167e9d0c70e5bcd7b6abf307399 Mon Sep 17 00:00:00 2001 From: Grzegorz Koper Date: Thu, 22 Sep 2022 14:10:04 +0200 Subject: [PATCH 23/32] bumping bifrost_tag to latest built --- etc/kayobe/kolla/globals.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index 3feacd480..264c0e663 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -4,7 +4,7 @@ docker_yum_baseurl: "{{ stackhpc_repo_docker_url }}" docker_yum_gpgkey: "https://download.docker.com/linux/{% raw %}{{ ansible_facts.distribution | lower }}{% endraw %}/gpg" {% if kolla_base_distro == 'centos' %} -bifrost_tag: wallaby-20220825T103439 +bifrost_tag: wallaby-20220921T100954 {% else %} bifrost_tag: wallaby-20220825T112231 {% endif %} From 1ed494123ec103760476dc6091aac75e9470ee15 Mon Sep 17 00:00:00 2001 From: Grzegorz Koper Date: Fri, 23 Sep 2022 12:18:18 +0200 Subject: [PATCH 24/32] Removing unused Ceph Nautilus repositories --- etc/kayobe/pulp-repo-versions.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml index c89a80131..dba18e296 100644 --- a/etc/kayobe/pulp-repo-versions.yml +++ b/etc/kayobe/pulp-repo-versions.yml @@ -1,6 +1,5 @@ --- # Do not edit! This file is autogenerated by Ansible. -stackhpc_pulp_repo_centos_8_storage_ceph_nautilus_version: 20220617T100837 stackhpc_pulp_repo_centos_stream_8_advanced_virtualization_version: 20211122T102435 stackhpc_pulp_repo_centos_stream_8_appstream_version: 20220817T082321 stackhpc_pulp_repo_centos_stream_8_baseos_version: 20220817T082321 From d5285efda99fa016220b47b422413c91f3027201 Mon Sep 17 00:00:00 2001 From: Grzegorz Koper Date: Mon, 26 Sep 2022 10:57:45 +0200 Subject: [PATCH 25/32] Changing the tag to latest promoted --- etc/kayobe/kolla.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 960acd326..75a93ae92 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -91,7 +91,7 @@ kolla_docker_registry_password: "{{ stackhpc_docker_registry_password }}" # Kolla OpenStack release version. This should be a Docker image tag. # Default is {{ openstack_release }}. -kolla_openstack_release: "{% if kolla_base_distro == 'centos' %}wallaby-20220905T105054{% else %}wallaby-20220819T112725{% endif %}" +kolla_openstack_release: "{% if kolla_base_distro == 'centos' %}wallaby-20220919T081704{% else %}wallaby-20220819T112725{% endif %}" # Docker tag applied to built container images. Default is # {{ kolla_openstack_release }}. From 8ec7fc69117b8e0f39ebea2c37efc5a424bbc905 Mon Sep 17 00:00:00 2001 From: Piotr Parczewski Date: Thu, 29 Sep 2022 22:23:42 +0200 Subject: [PATCH 26/32] Prevent 'base' type images from syncing / publishing --- etc/kayobe/pulp.yml | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml index 5805dc92a..57b61970e 100644 --- a/etc/kayobe/pulp.yml +++ b/etc/kayobe/pulp.yml @@ -424,24 +424,18 @@ stackhpc_release_pulp_registry_url: "{{ stackhpc_release_pulp_url }}" # List of all image names. stackhpc_pulp_images_kolla: - barbican-api - - barbican-base - barbican-keystone-listener - barbican-worker - - base - - bifrost-base - bifrost-deploy - cinder-api - cinder-backup - - cinder-base - cinder-scheduler - cinder-volume - cloudkitty-api - - cloudkitty-base - cloudkitty-processor - cron - designate-api - designate-backend-bind9 - - designate-base - designate-central - designate-mdns - designate-producer @@ -452,17 +446,14 @@ stackhpc_pulp_images_kolla: - elasticsearch-curator - fluentd - glance-api - - glance-base - grafana - haproxy - heat-api - heat-api-cfn - - heat-base - heat-engine - horizon - influxdb - ironic-api - - ironic-base - ironic-conductor - ironic-inspector - ironic-neutron-agent @@ -470,24 +461,19 @@ stackhpc_pulp_images_kolla: - iscsid - keepalived - keystone - - keystone-base - keystone-fernet - keystone-ssh - kibana - kolla-toolbox - magnum-api - - magnum-base - magnum-conductor - manila-api - - manila-base - manila-data - manila-scheduler - manila-share - - mariadb-base - mariadb-clustercheck - mariadb-server - memcached - - neutron-base - neutron-dhcp-agent - neutron-l3-agent - neutron-metadata-agent @@ -495,7 +481,6 @@ stackhpc_pulp_images_kolla: - neutron-server - neutron-sriov-agent - nova-api - - nova-base - nova-compute - nova-compute-ironic - nova-conductor @@ -505,25 +490,19 @@ stackhpc_pulp_images_kolla: - nova-serialproxy - nova-ssh - octavia-api - - octavia-base - octavia-driver-agent - octavia-health-manager - octavia-housekeeping - octavia-worker - - openstack-base - - openvswitch-base - openvswitch-db-server - openvswitch-netcontrold - openvswitch-vswitchd - - ovn-base - ovn-controller - ovn-nb-db-server - ovn-northd - ovn-sb-db-server - placement-api - - placement-base - prometheus-alertmanager - - prometheus-base - prometheus-blackbox-exporter - prometheus-cadvisor - prometheus-elasticsearch-exporter @@ -539,11 +518,9 @@ stackhpc_pulp_images_kolla: - prometheus-v2-server - rabbitmq - redis - - redis-base - redis-sentinel - skydive-agent - skydive-analyzer - - skydive-base # Whitespace-separated list of regular expressions matching Kolla image names. # Usage is similar to kolla-build CLI arguments. From a25dbaa1aeee10f82320090e9bd533a3918946b4 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Wed, 21 Sep 2022 09:31:07 +0200 Subject: [PATCH 27/32] Prevent failures when dhclient is not running --- terraform/aio/scripts/configure-local-networking.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/aio/scripts/configure-local-networking.sh b/terraform/aio/scripts/configure-local-networking.sh index 0b4869bc3..c7bd70bf8 100644 --- a/terraform/aio/scripts/configure-local-networking.sh +++ b/terraform/aio/scripts/configure-local-networking.sh @@ -55,4 +55,4 @@ if ! sudo ip a show dev breth1 | grep $public_ip/24 >/dev/null 2>&1; then fi # This prevents network.service from restarting correctly. -sudo killall dhclient +sudo killall dhclient || true From 21f170727e2786f8b30c02fdfdb26f5611b07ad4 Mon Sep 17 00:00:00 2001 From: Piotr Parczewski Date: Thu, 29 Sep 2022 15:28:10 +0200 Subject: [PATCH 28/32] Let Ansible Galaxy handle dependencies squeezer is already listed as stackhpc.pulp collection's dependency --- etc/kayobe/ansible/requirements.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/etc/kayobe/ansible/requirements.yml b/etc/kayobe/ansible/requirements.yml index a00fa1efc..fe8432ac7 100644 --- a/etc/kayobe/ansible/requirements.yml +++ b/etc/kayobe/ansible/requirements.yml @@ -4,5 +4,3 @@ collections: version: 1.8.0 - name: stackhpc.pulp version: 0.3.0 - - name: pulp.squeezer - version: 0.0.11 From 1f687fc9aff2644eb15e9da1ee7e9b2a4351e54d Mon Sep 17 00:00:00 2001 From: Piotr Parczewski Date: Thu, 29 Sep 2022 15:28:47 +0200 Subject: [PATCH 29/32] Bump up the Cephadm collection version --- etc/kayobe/ansible/requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/kayobe/ansible/requirements.yml b/etc/kayobe/ansible/requirements.yml index fe8432ac7..99a0c83f7 100644 --- a/etc/kayobe/ansible/requirements.yml +++ b/etc/kayobe/ansible/requirements.yml @@ -1,6 +1,6 @@ --- collections: - name: stackhpc.cephadm - version: 1.8.0 + version: 1.10.0 - name: stackhpc.pulp version: 0.3.0 From 0b9630f9e5160e19e4b04a9a3cc5226556a0c679 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Wed, 28 Sep 2022 14:37:28 +0200 Subject: [PATCH 30/32] Bump repos to the same versions as Wallaby --- etc/kayobe/pulp-repo-versions.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml index a4c8cf6f4..df5ff8f1a 100644 --- a/etc/kayobe/pulp-repo-versions.yml +++ b/etc/kayobe/pulp-repo-versions.yml @@ -1,25 +1,25 @@ --- # Do not edit! This file is autogenerated by Ansible. stackhpc_pulp_repo_centos_stream_8_advanced_virtualization_version: 20211122T102435 -stackhpc_pulp_repo_centos_stream_8_appstream_version: 20220607T061247 -stackhpc_pulp_repo_centos_stream_8_baseos_version: 20220607T061247 +stackhpc_pulp_repo_centos_stream_8_appstream_version: 20220817T082321 +stackhpc_pulp_repo_centos_stream_8_baseos_version: 20220817T082321 stackhpc_pulp_repo_centos_stream_8_extras_version: 20220401T032901 stackhpc_pulp_repo_centos_stream_8_nfv_extras_version: 20220609T110556 -stackhpc_pulp_repo_centos_stream_8_nfv_openvswitch_version: 20220616T202817 -stackhpc_pulp_repo_centos_stream_8_openstack_xena_version: 20220612T035123 +stackhpc_pulp_repo_centos_stream_8_nfv_openvswitch_version: 20220824T113700 +stackhpc_pulp_repo_centos_stream_8_openstack_xena_version: 20220823T042339 stackhpc_pulp_repo_centos_stream_8_opstools_version: 20220617T100837 -stackhpc_pulp_repo_centos_stream_8_powertools_version: 20220607T061247 -stackhpc_pulp_repo_centos_stream_8_storage_ceph_pacific_version: 20220525T030654 +stackhpc_pulp_repo_centos_stream_8_powertools_version: 20220817T082321 +stackhpc_pulp_repo_centos_stream_8_storage_ceph_pacific_version: 20220803T043053 stackhpc_pulp_repo_docker_ce_ubuntu_version: 20220708T132615 -stackhpc_pulp_repo_docker_version: 20220607T061247 -stackhpc_pulp_repo_elasticsearch_logstash_kibana_7_x_version: 20220525T030654 -stackhpc_pulp_repo_epel_modular_version: 20220604T032730 -stackhpc_pulp_repo_epel_version: 20220617T050552 -stackhpc_pulp_repo_grafana_version: 20220616T113902 -stackhpc_pulp_repo_mariadb_10_5_centos8_version: 20220609T110556 -stackhpc_pulp_repo_rabbitmq_erlang_version: 20220616T113902 -stackhpc_pulp_repo_rabbitmq_server_version: 20220602T033149 -stackhpc_pulp_repo_treasuredata_4_version: 20220429T160649 +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: 20220831T050502 +stackhpc_pulp_repo_mariadb_10_5_centos8_version: 20220817T082321 +stackhpc_pulp_repo_rabbitmq_erlang_version: 20220828T050510 +stackhpc_pulp_repo_rabbitmq_server_version: 20220803T043053 +stackhpc_pulp_repo_treasuredata_4_version: 20220823T042339 stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20220804T040153 stackhpc_pulp_repo_ubuntu_focal_security_version: 20220804T040153 stackhpc_pulp_repo_ubuntu_focal_version: 20220804T040153 From ac99e01976f7633815ad0a35264328469ef86d25 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 5 Oct 2022 13:34:16 +0100 Subject: [PATCH 31/32] Remove duplicate opstools repo --- etc/kayobe/stackhpc.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/etc/kayobe/stackhpc.yml b/etc/kayobe/stackhpc.yml index e82d98bc8..e0d41155c 100644 --- a/etc/kayobe/stackhpc.yml +++ b/etc/kayobe/stackhpc.yml @@ -71,10 +71,6 @@ stackhpc_repo_centos_stream_openstack_xena_version: "{{ stackhpc_repo_distributi stackhpc_repo_centos_stream_opstools_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/8-stream/opstools/x86_64/collectd-5/{{ stackhpc_repo_centos_stream_opstools_version }}" stackhpc_repo_centos_stream_opstools_version: "{{ stackhpc_repo_distribution }}" -# CentOS Stream 8 - OpsTools - collectd -stackhpc_repo_centos_stream_opstools_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/8-stream/opstools/x86_64/collectd-5/{{ stackhpc_repo_centos_stream_opstools_version }}" -stackhpc_repo_centos_stream_opstools_version: "{{ stackhpc_repo_distribution }}" - # CentOS Stream 8 - PowerTools stackhpc_repo_centos_stream_powertools_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/8-stream/PowerTools/x86_64/os/{{ stackhpc_repo_centos_stream_powertools_version }}" stackhpc_repo_centos_stream_powertools_version: "{{ stackhpc_repo_distribution }}" From e8aa86bb7d8ea3c976358ad714695f2da1fd5098 Mon Sep 17 00:00:00 2001 From: Piotr Parczewski Date: Thu, 29 Sep 2022 15:33:36 +0200 Subject: [PATCH 32/32] Xena: Add system logging custom playbook --- etc/kayobe/ansible/rsyslog.yml | 36 +++++++++++++++++++ .../overcloud-service-deploy/post.d/.gitkeep | 0 2 files changed, 36 insertions(+) create mode 100644 etc/kayobe/ansible/rsyslog.yml create mode 100644 etc/kayobe/hooks/overcloud-service-deploy/post.d/.gitkeep diff --git a/etc/kayobe/ansible/rsyslog.yml b/etc/kayobe/ansible/rsyslog.yml new file mode 100644 index 000000000..acc567eb7 --- /dev/null +++ b/etc/kayobe/ansible/rsyslog.yml @@ -0,0 +1,36 @@ +--- +# Custom playbook to configure rsyslog to forward operating system logs to +# fluentd, eventually reaching Kolla's Elasticsearch cluster. +# +# Variables: +# * rsyslog_group: Host pattern against which to target the playbook. Default +# is 'overcloud'. + +- name: Configure rsyslog to forward messages + hosts: "{{ rsyslog_group | default('overcloud') }}" + become: yes + + tasks: + - name: Ensure rsyslog is installed + package: + name: rsyslog + state: present + + - name: Ensure rsyslog is started and enabled + systemd: + state: started + enabled: yes + name: rsyslog + + - name: Update rsyslog configuration + lineinfile: + path: /etc/rsyslog.conf + insertafter: "^#*.* @@remote-host:514" + line: "*.* @{{ internal_net_name | net_ip }}:5140" + register: rsyslog_config + + - name: Restart rsyslog + systemd: + state: restarted + name: rsyslog + when: rsyslog_config.changed diff --git a/etc/kayobe/hooks/overcloud-service-deploy/post.d/.gitkeep b/etc/kayobe/hooks/overcloud-service-deploy/post.d/.gitkeep new file mode 100644 index 000000000..e69de29bb