From 1ace0c2dd6838f43e817dd0f0ee3a9a4e94e72b7 Mon Sep 17 00:00:00 2001 From: Seunghun Lee <45145778+seunghun1ee@users.noreply.github.com> Date: Tue, 16 Jan 2024 13:04:34 +0000 Subject: [PATCH 01/10] Update to Rocky Linux 9.3 (#828) * Update pulp repo versions from gh action artifact * Update default stackhpc pulp repo rocky version to 9.3 * Update Kolla container image tags to RL 9.3 Co-authored-by: Mark Goddard --- etc/kayobe/kolla/globals.yml | 16 ++++++++++++---- etc/kayobe/pulp-repo-versions.yml | 15 ++++++++++----- etc/kayobe/pulp.yml | 4 ++-- .../add-rocky-9.3-repos-454c2f825e088417.yaml | 9 +++++++++ 4 files changed, 33 insertions(+), 11 deletions(-) create mode 100644 releasenotes/notes/add-rocky-9.3-repos-454c2f825e088417.yaml diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index 0abaeffaf..79f55f089 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -13,16 +13,24 @@ kolla_base_distro: "{% raw %}{{ 'centos' if ansible_facts.distribution == 'Rocky kayobe_image_tags: openstack: centos: yoga-20231024T093507 - rocky: yoga-20231024T093507 + rocky: yoga-20231218T141822 ubuntu: yoga-20231024T093507 + cloudkitty: + centos: yoga-20231107T165648 + rocky: yoga-20231218T141822 + ubuntu: yoga-20231107T165648 + neutron: + centos: yoga-20231114T125927 + rocky: yoga-20240105T120257 + ubuntu: yoga-20231114T125927 nova: centos: yoga-20231113T171023 - rocky: yoga-20231103T161400 + rocky: yoga-20240105T120257 ubuntu: yoga-20231103T161400 -cloudkitty_tag: yoga-20231107T165648 +cloudkitty_tag: "{% raw %}{{ kayobe_image_tags['cloudkitty'][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 %}" -neutron_tag: yoga-20231114T125927 opensearch_tag: yoga-20231219T221916 # These overrides are currently redundant, but are kept because it's not obvious that you need them if setting haproxy_tag diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml index f7ecb093b..407aaf298 100644 --- a/etc/kayobe/pulp-repo-versions.yml +++ b/etc/kayobe/pulp-repo-versions.yml @@ -53,11 +53,16 @@ stackhpc_pulp_repo_rocky_9_1_baseos_version: 20231020T014922 stackhpc_pulp_repo_rocky_9_1_crb_version: 20231020T014922 stackhpc_pulp_repo_rocky_9_1_extras_version: 20231020T014922 stackhpc_pulp_repo_rocky_9_1_highavailability_version: 20231020T014922 -stackhpc_pulp_repo_rocky_9_2_appstream_version: 20231018T041416 -stackhpc_pulp_repo_rocky_9_2_baseos_version: 20231020T014922 -stackhpc_pulp_repo_rocky_9_2_crb_version: 20231020T014922 -stackhpc_pulp_repo_rocky_9_2_extras_version: 20231001T002904 -stackhpc_pulp_repo_rocky_9_2_highavailability_version: 20230918T015928 +stackhpc_pulp_repo_rocky_9_2_appstream_version: 20231211T120328 +stackhpc_pulp_repo_rocky_9_2_baseos_version: 20231211T120328 +stackhpc_pulp_repo_rocky_9_2_crb_version: 20231207T013715 +stackhpc_pulp_repo_rocky_9_2_extras_version: 20231207T013715 +stackhpc_pulp_repo_rocky_9_2_highavailability_version: 20231208T011702 +stackhpc_pulp_repo_rocky_9_3_appstream_version: 20231215T005810 +stackhpc_pulp_repo_rocky_9_3_baseos_version: 20231215T005810 +stackhpc_pulp_repo_rocky_9_3_crb_version: 20231215T005810 +stackhpc_pulp_repo_rocky_9_3_extras_version: 20231211T120328 +stackhpc_pulp_repo_rocky_9_3_highavailability_version: 20231214T005538 stackhpc_pulp_repo_treasuredata_4_version: 20230903T003752 stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20231019T125502 stackhpc_pulp_repo_ubuntu_focal_security_version: 20231018T165217 diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml index 884bf679b..3e268a662 100644 --- a/etc/kayobe/pulp.yml +++ b/etc/kayobe/pulp.yml @@ -232,8 +232,8 @@ stackhpc_pulp_sync_el_8: "{{ stackhpc_pulp_sync_rocky_8 or stackhpc_pulp_sync_ce # Whether to sync Rocky Linux 9 packages. stackhpc_pulp_sync_rocky_9: "{{ os_distribution == 'rocky' and os_release == '9' }}" -# Rocky 9 minor version number. Supported values: 1, 2. Default is 2 -stackhpc_pulp_repo_rocky_9_minor_version: 2 +# Rocky 9 minor version number. Supported values: 1, 2, 3. Default is 3 +stackhpc_pulp_repo_rocky_9_minor_version: 3 # Rocky 9 Snapshot versions. The defaults use the appropriate version from # pulp-repo-versions.yml for the selected minor release. stackhpc_pulp_repo_rocky_9_appstream_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_9_%s_appstream_version' % stackhpc_pulp_repo_rocky_9_minor_version) }}" diff --git a/releasenotes/notes/add-rocky-9.3-repos-454c2f825e088417.yaml b/releasenotes/notes/add-rocky-9.3-repos-454c2f825e088417.yaml new file mode 100644 index 000000000..9a25d0e1e --- /dev/null +++ b/releasenotes/notes/add-rocky-9.3-repos-454c2f825e088417.yaml @@ -0,0 +1,9 @@ +--- +features: + - | + Added support for Rocky Linux 9.3 repositories and Kolla containers. + Made 9.3 the default version for Rocky Linux. + - | + Updated Rocky Linux 9.2 pulp repo versions. + Added Rocky Linux 9.3 pulp repo versions. + Rebuilt Kolla containers with Rocky Linux 9.3. From 175150ce91d7453b4085bd19c5fb1afdce5aee47 Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Wed, 17 Jan 2024 12:56:32 +0000 Subject: [PATCH 02/10] Add warning about interface name change from hw_machine_type --- doc/source/operations/rocky-linux-9.rst | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/doc/source/operations/rocky-linux-9.rst b/doc/source/operations/rocky-linux-9.rst index 73b332e5a..cdab015a7 100644 --- a/doc/source/operations/rocky-linux-9.rst +++ b/doc/source/operations/rocky-linux-9.rst @@ -83,8 +83,17 @@ Make the following changes to your Kayobe configuration: hw_machine_type = x86_64=q35 num_pcie_ports = 16 - This change does not need to be applied before migrating to Rocky Linux 9, but it should cause no harm to do so. - Note that this will not affect existing VMs, only newly created VMs. + This change does not need to be applied before migrating to Rocky Linux 9, + but it is likely to best place to do so. + + .. warning:: + + This change will cause the interface names to change on any new VMs + launched with images that do not specify a hw_machine_type already. + Existing VMs will not be affected, but a rebuild will have the names + changed. Customers should be informed of this in case they have any + tooling that relies on interface names within their VMs. + Routing rules ------------- From d373d455698370a629ef91671cc0b137df6ab713 Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Wed, 17 Jan 2024 13:32:36 +0000 Subject: [PATCH 03/10] Update doc/source/operations/rocky-linux-9.rst Co-authored-by: Mark Goddard --- doc/source/operations/rocky-linux-9.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/operations/rocky-linux-9.rst b/doc/source/operations/rocky-linux-9.rst index cdab015a7..123534e59 100644 --- a/doc/source/operations/rocky-linux-9.rst +++ b/doc/source/operations/rocky-linux-9.rst @@ -84,7 +84,7 @@ Make the following changes to your Kayobe configuration: num_pcie_ports = 16 This change does not need to be applied before migrating to Rocky Linux 9, - but it is likely to best place to do so. + but it is likely the best time to do so. .. warning:: From bcc7f6f34f8de8bec35dd5b665cc03410598ab25 Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Wed, 17 Jan 2024 14:59:20 +0000 Subject: [PATCH 04/10] Lower the MTU in aufn-ceph so it can run in a VM Now that we're lacking in baremetals, AUFNs need to be run in VMs. The geneve network on SMS lab has MTU 1442, so networks need to be lowered to match this. --- etc/kayobe/environments/aufn-ceph/networks.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/etc/kayobe/environments/aufn-ceph/networks.yml b/etc/kayobe/environments/aufn-ceph/networks.yml index 4b1178110..89a30331c 100644 --- a/etc/kayobe/environments/aufn-ceph/networks.yml +++ b/etc/kayobe/environments/aufn-ceph/networks.yml @@ -55,19 +55,19 @@ cleaning_net_name: provision_wl # Network definitions. mgmt_cidr: 192.168.35.0/24 -mgmt_mtu: 1450 +mgmt_mtu: 1442 # Native VLAN mgmt_physical_network: mgmt provision_oc_cidr: 192.168.33.0/24 -provision_oc_mtu: 1450 +provision_oc_mtu: 1442 provision_oc_inspection_allocation_pool_start: 192.168.33.128 provision_oc_inspection_allocation_pool_end: 192.168.33.254 # Native VLAN provision_oc_physical_network: provision provision_wl_cidr: 192.168.36.0/24 -provision_wl_mtu: 1450 +provision_wl_mtu: 1442 provision_wl_inspection_allocation_pool_start: 192.168.36.128 provision_wl_inspection_allocation_pool_end: 192.168.36.254 provision_wl_neutron_allocation_pool_start: 192.168.36.2 @@ -76,7 +76,7 @@ provision_wl_neutron_allocation_pool_end: 192.168.36.127 provision_wl_physical_network: cloud internal_cidr: 192.168.37.0/24 -internal_mtu: 1450 +internal_mtu: 1442 internal_allocation_pool_start: 192.168.37.3 internal_allocation_pool_end: 192.168.37.254 internal_vip_address: 192.168.37.2 @@ -89,7 +89,7 @@ external_vlan: 102 external_physical_network: cloud public_cidr: 192.168.39.0/24 -public_mtu: 1450 +public_mtu: 1442 public_allocation_pool_start: 192.168.39.3 public_allocation_pool_end: 192.168.39.254 public_vip_address: 192.168.39.2 @@ -97,17 +97,17 @@ public_vlan: 103 public_physical_network: cloud tunnel_cidr: 192.168.40.0/24 -tunnel_mtu: 1450 +tunnel_mtu: 1442 tunnel_vlan: 104 tunnel_physical_network: cloud storage_cidr: 192.168.41.0/24 -storage_mtu: 1450 +storage_mtu: 1442 storage_vlan: 105 storage_physical_network: cloud storage_mgmt_cidr: 192.168.42.0/24 -storage_mgmt_mtu: 1450 +storage_mgmt_mtu: 1442 storage_mgmt_vlan: 106 storage_mgmt_physical_network: cloud From e4a65f389cd334eedce8daa0cbb5bfb7f3fa9603 Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Wed, 17 Jan 2024 15:02:38 +0000 Subject: [PATCH 05/10] AUFN-Ceph: Skip docker registry login before pulp is deployed --- etc/kayobe/environments/aufn-ceph/a-universe-from-nothing.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/kayobe/environments/aufn-ceph/a-universe-from-nothing.sh b/etc/kayobe/environments/aufn-ceph/a-universe-from-nothing.sh index e594ea388..1464e6127 100755 --- a/etc/kayobe/environments/aufn-ceph/a-universe-from-nothing.sh +++ b/etc/kayobe/environments/aufn-ceph/a-universe-from-nothing.sh @@ -87,7 +87,7 @@ kayobe seed vm provision kayobe seed host configure # Deploy local pulp server as a container on the seed VM -kayobe seed service deploy --tags seed-deploy-containers --kolla-tags none +kayobe seed service deploy --tags seed-deploy-containers --kolla-tags none -e deploy_containers_registry_attempt_login=False # Deploying the seed restarts networking interface, run configure-local-networking.sh again to re-add routes. $KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/configure-local-networking.sh From c6ed1bca4559cfe59bae4b97a0e5e9fb3d3a2d5b Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Thu, 18 Jan 2024 11:28:28 +0100 Subject: [PATCH 06/10] Update Consul and Vault to latest MPL releases --- etc/kayobe/inventory/group_vars/all/vault | 8 ++++---- .../notes/bump-hashicorp-images-2c23873ad5eeb719.yaml | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 releasenotes/notes/bump-hashicorp-images-2c23873ad5eeb719.yaml diff --git a/etc/kayobe/inventory/group_vars/all/vault b/etc/kayobe/inventory/group_vars/all/vault index dae698b54..eda95114f 100644 --- a/etc/kayobe/inventory/group_vars/all/vault +++ b/etc/kayobe/inventory/group_vars/all/vault @@ -10,13 +10,13 @@ seed_hashicorp_registry_password: "{{ stackhpc_docker_registry_password if stack seed_consul_docker_image: "{{ stackhpc_docker_registry ~ '/' if stackhpc_sync_hashicorp_images | bool else '' }}hashicorp/consul" # Seed Consul container image tag. -seed_consul_docker_tag: "1.16.3" +seed_consul_docker_tag: "1.16.4" # Seed Vault container image. seed_vault_docker_image: "{{ stackhpc_docker_registry ~ '/' if stackhpc_sync_hashicorp_images | bool else '' }}hashicorp/vault" # Seed Vault container image tag. -seed_vault_docker_tag: "1.14.6" +seed_vault_docker_tag: "1.14.8" # Seed Vault PKI Role name seed_vault_pki_role_name: "ServerCert" @@ -47,13 +47,13 @@ overcloud_hashicorp_registry_password: "{{ stackhpc_docker_registry_password if overcloud_consul_docker_image: "{{ stackhpc_docker_registry ~ '/' if stackhpc_sync_hashicorp_images | bool else '' }}hashicorp/consul" # Overcloud Consul container image tag. -overcloud_consul_docker_tag: "1.16.1" +overcloud_consul_docker_tag: "1.16.4" # Overcloud Vault container image. overcloud_vault_docker_image: "{{ stackhpc_docker_registry ~ '/' if stackhpc_sync_hashicorp_images | bool else '' }}hashicorp/vault" # Overcloud Vault container image tag. -overcloud_vault_docker_tag: "1.14.1" +overcloud_vault_docker_tag: "1.14.8" # Overcloud Vault PKI Default Role name overcloud_vault_pki_default_role_name: "ServerCert" diff --git a/releasenotes/notes/bump-hashicorp-images-2c23873ad5eeb719.yaml b/releasenotes/notes/bump-hashicorp-images-2c23873ad5eeb719.yaml new file mode 100644 index 000000000..8d52ac986 --- /dev/null +++ b/releasenotes/notes/bump-hashicorp-images-2c23873ad5eeb719.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + Updates Consul to 1.16.4 and Vault to 1.14.8. From 415eeda60c9a33a0fd75daa64975ac6748194193 Mon Sep 17 00:00:00 2001 From: Alex-Welsh Date: Thu, 18 Jan 2024 12:18:31 +0000 Subject: [PATCH 07/10] Add tempest-artifacts to gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 6bdc17df2..d83d0ce41 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,6 @@ etc/kayobe/environments/aufn-ceph/kolla/config/cinder/ceph.conf etc/kayobe/environments/aufn-ceph/kolla/config/cinder/ceph.client.glance.keyring etc/kayobe/environments/aufn-ceph/kolla/config/nova/ceph.conf etc/kayobe/environments/aufn-ceph/kolla/config/nova/ceph.client.glance.keyring + +# Tempest logs +tempest-artifacts From 6c033997e8ae53c4bce9b3595ba70f6e9b293445 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Thu, 18 Jan 2024 18:09:24 +0100 Subject: [PATCH 08/10] Disable Bifrost Ironic debug logging --- etc/kayobe/kolla/config/bifrost/bifrost.yml | 3 +++ .../notes/bifrost-disable-ironic-debug-5427c6f1160779aa.yaml | 5 +++++ 2 files changed, 8 insertions(+) create mode 100644 releasenotes/notes/bifrost-disable-ironic-debug-5427c6f1160779aa.yaml diff --git a/etc/kayobe/kolla/config/bifrost/bifrost.yml b/etc/kayobe/kolla/config/bifrost/bifrost.yml index d4b585b6a..16ea3ac3b 100644 --- a/etc/kayobe/kolla/config/bifrost/bifrost.yml +++ b/etc/kayobe/kolla/config/bifrost/bifrost.yml @@ -5,3 +5,6 @@ use_cirros: true cirros_deploy_image_upstream_url: "{{ stackhpc_overcloud_host_image_url }}" {% endif %} + +# Disable debug logging to avoid generating large log files +ironic_debug: false diff --git a/releasenotes/notes/bifrost-disable-ironic-debug-5427c6f1160779aa.yaml b/releasenotes/notes/bifrost-disable-ironic-debug-5427c6f1160779aa.yaml new file mode 100644 index 000000000..0a945ad5d --- /dev/null +++ b/releasenotes/notes/bifrost-disable-ironic-debug-5427c6f1160779aa.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + Bifrost Ironic debug logging is now disabled by default. Change + ``ironic_debug`` to ``true`` to revert. From 313faf3e70d679d64588950762406be7a6eef3c4 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Fri, 19 Jan 2024 11:58:27 +0100 Subject: [PATCH 09/10] Set OpenSearch heap size This is required for deployments using Rocky Linux 9. Without this setting, OpenSearch would set heap size to 1 GB by default, which can trigger alerts on production systems. --- etc/kayobe/environments/aufn-ceph/kolla/globals.yml | 3 ++- etc/kayobe/environments/ci-aio/kolla/globals.yml | 3 ++- etc/kayobe/environments/ci-multinode/kolla/globals.yml | 3 ++- etc/kayobe/kolla/globals.yml | 1 + .../notes/fix-opensearch-heap-size-0cd31054927d4bbd.yaml | 4 ++++ 5 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 releasenotes/notes/fix-opensearch-heap-size-0cd31054927d4bbd.yaml diff --git a/etc/kayobe/environments/aufn-ceph/kolla/globals.yml b/etc/kayobe/environments/aufn-ceph/kolla/globals.yml index 71c874a69..7c5cf2a5c 100644 --- a/etc/kayobe/environments/aufn-ceph/kolla/globals.yml +++ b/etc/kayobe/environments/aufn-ceph/kolla/globals.yml @@ -13,5 +13,6 @@ glance_backend_ceph: "yes" cinder_backend_ceph: "yes" nova_backend_ceph: "yes" -# Elasticsearch memory tuning +# Elasticsearch / OpenSearch memory tuning es_heap_size: 1g +opensearch_heap_size: 1g diff --git a/etc/kayobe/environments/ci-aio/kolla/globals.yml b/etc/kayobe/environments/ci-aio/kolla/globals.yml index 626ecae08..b717d6e54 100644 --- a/etc/kayobe/environments/ci-aio/kolla/globals.yml +++ b/etc/kayobe/environments/ci-aio/kolla/globals.yml @@ -12,8 +12,9 @@ openstack_service_rpc_workers: "1" docker_yum_baseurl: "{{ stackhpc_repo_docker_url }}" docker_yum_gpgkey: "https://download.docker.com/linux/centos/gpg" -# Elasticsearch memory tuning +# Elasticsearch / OpenSearch memory tuning es_heap_size: 1g +opensearch_heap_size: 1g # Increase Grafana timeout grafana_start_first_node_retries: 20 diff --git a/etc/kayobe/environments/ci-multinode/kolla/globals.yml b/etc/kayobe/environments/ci-multinode/kolla/globals.yml index bd075c704..eab31a1d8 100644 --- a/etc/kayobe/environments/ci-multinode/kolla/globals.yml +++ b/etc/kayobe/environments/ci-multinode/kolla/globals.yml @@ -20,8 +20,9 @@ nova_backend_ceph: "yes" neutron_bridge_name: "{{ vxlan_interfaces[0].device }}-ovs" neutron_external_interface: "{{ vxlan_interfaces[0].device }}" -# Elasticsearch memory tuning +# Elasticsearch / OpenSearch memory tuning es_heap_size: 1g +opensearch_heap_size: 1g # Octavia load balancer configuration octavia_auto_configure: "no" diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index 79f55f089..65e22705b 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -43,6 +43,7 @@ om_enable_rabbitmq_high_availability: true # Monitoring and alerting related settings es_heap_size: 8g +opensearch_heap_size: 8g prometheus_cmdline_extras: "--storage.tsdb.retention.time=30d" # Additional command line flags for node exporter to enable texfile collector for disk metrics and create textfile docker volume diff --git a/releasenotes/notes/fix-opensearch-heap-size-0cd31054927d4bbd.yaml b/releasenotes/notes/fix-opensearch-heap-size-0cd31054927d4bbd.yaml new file mode 100644 index 000000000..1a33a997a --- /dev/null +++ b/releasenotes/notes/fix-opensearch-heap-size-0cd31054927d4bbd.yaml @@ -0,0 +1,4 @@ +--- +fixes: + - | + Bumps OpenSearch heap size to 8 GB, to be identical to Elasticsearch. From a75ece3a0e7ae22d4ac93671cb09e052b8d9c72b Mon Sep 17 00:00:00 2001 From: Alex-Welsh Date: Fri, 19 Jan 2024 11:04:01 +0000 Subject: [PATCH 10/10] Update .automation checkout for rsync patch --- .automation | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.automation b/.automation index 9ba253a9a..b00f285be 160000 --- a/.automation +++ b/.automation @@ -1 +1 @@ -Subproject commit 9ba253a9adba51011ce74aa87e708015dafc75fc +Subproject commit b00f285be240e34c643c4bd93a877e56587f71fa