Merge pull request #888 from stackhpc/sync-zed

Sync yoga into zed
stackhpc · Jan 19, 2024 · 5b2b98b · 5b2b98b
2 parents 85d0798 + ee362ae
commit 5b2b98b
Show file tree

Hide file tree

Showing 12 changed files with 54 additions and 21 deletions.
diff --git a/.automation b/.automation
diff --git 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
diff --git 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

diff --git 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,25 +89,25 @@ 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
 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
 

diff --git 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/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/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml
@@ -21,11 +21,16 @@ stackhpc_pulp_repo_rocky_9_1_baseos_version: 20230921T005001
 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_ubuntu_jammy_security_version: 20231020T074329
 stackhpc_pulp_repo_ubuntu_jammy_version: 20231020T074329
 stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20231019T125502
diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml
@@ -196,8 +196,8 @@ stackhpc_pulp_distribution_deb_production: >-
 
 # Whether to sync Rocky Linux 9 packages.
 stackhpc_pulp_sync_rocky_9: "{{ os_distribution == 'rocky' }}"
-# 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
@@ -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.
diff --git a/releasenotes/notes/bifrost-disable-ironic-debug-5427c6f1160779aa.yaml 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.
diff --git a/releasenotes/notes/bump-hashicorp-images-2c23873ad5eeb719.yaml 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.
diff --git a/releasenotes/notes/fix-opensearch-heap-size-0cd31054927d4bbd.yaml 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.
+1 −0		ansible/kayobe-automation-run-tempest.yml
+6 −10		docker/kayobe/Dockerfile
+7 −3		functions
+24 −0		scripts/overcloud-service-configuration-generate.sh