Skip to content

Commit d7a433c

Browse files
committed
CB-23918: RHEL 8.10 + JDK 8 breaks image burning
1 parent 370fab1 commit d7a433c

File tree

2 files changed

+16
-0
lines changed

2 files changed

+16
-0
lines changed

Makefile

+6
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ $(error "AZURE_IMAGE_VHD and Marketplace image properties (AZURE_IMAGE_PUBLISHER
4747
# CB-26812: Temp rollback!
4848
# AZURE_IMAGE_SKU ?= rhel-lvm10
4949
AZURE_IMAGE_SKU ?= rhel-lvm88
50+
else ifeq ($(STACK_VERSION),7.2.18)
51+
AZURE_IMAGE_SKU ?= rhel-lvm810
5052
else
5153
AZURE_IMAGE_SKU ?= rhel-lvm88
5254
endif
@@ -77,6 +79,8 @@ ifeq ($(CLOUD_PROVIDER),AWS)
7779
# CB-26812: Temp rollback!
7880
# AWS_SOURCE_AMI ?= ami-02073841a355a1e92
7981
AWS_SOURCE_AMI ?= ami-039ce2eddc1949546
82+
else ifeq ($(STACK_VERSION),7.2.18)
83+
AWS_SOURCE_AMI ?= ami-02073841a355a1e92
8084
else
8185
AWS_SOURCE_AMI ?= ami-039ce2eddc1949546
8286
endif
@@ -106,6 +110,8 @@ ifeq ($(CLOUD_PROVIDER),GCP)
106110
# CB-26812: Temp rollback!
107111
# GCP_SOURCE_IMAGE ?= rhel-8-byos-v20240709
108112
GCP_SOURCE_IMAGE ?= rhel-8-byos-v20230615
113+
else ifeq ($(STACK_VERSION),7.2.18)
114+
GCP_SOURCE_IMAGE ?= rhel-8-byos-v20240709
109115
else
110116
GCP_SOURCE_IMAGE ?= rhel-8-byos-v20230615
111117
endif

saltstack/final/salt/krb5/init.sls

+10
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,14 @@ disable_kcm_ccache:
88
disable_sssd_conf_dir:
99
file.absent:
1010
- name: /etc/krb5.conf.d/enable_sssd_conf_dir
11+
12+
{% if salt['environ.get']('RHEL_VERSION') == '8.10' %}
13+
change_krb5_conf_crypto_policies:
14+
file.managed:
15+
- name: /etc/krb5.conf.d/crypto-policies
16+
- replace: True
17+
- contents: |
18+
[libdefaults]
19+
permitted_enctypes = aes256-cts-hmac-sha1-96 aes256-cts-hmac-sha384-192 camellia256-cts-cmac aes128-cts-hmac-sha1-96 aes128-cts-hmac-sha256-128 camellia128-cts-cmac
20+
{% endif %}
1121
{% endif %}

0 commit comments

Comments
 (0)