Skip to content

Commit

Permalink
CB-23918: RHEL 8.10 + JDK 8 breaks image burning
Browse files Browse the repository at this point in the history
  • Loading branch information
jszeles committed Aug 27, 2024
1 parent 9d5cb66 commit eea2f2b
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 0 deletions.
6 changes: 6 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ $(error "AZURE_IMAGE_VHD and Marketplace image properties (AZURE_IMAGE_PUBLISHER
AZURE_IMAGE_OFFER ?= rhel-byos
ifeq ($(STACK_VERSION),7.3.1)
AZURE_IMAGE_SKU ?= rhel-lvm810
else ifeq ($(STACK_VERSION),7.2.18)
AZURE_IMAGE_SKU ?= rhel-lvm810
else
AZURE_IMAGE_SKU ?= rhel-lvm88
endif
Expand All @@ -71,6 +73,8 @@ ifeq ($(CLOUD_PROVIDER),AWS)
else
ifeq ($(STACK_VERSION),7.3.1)
AWS_SOURCE_AMI ?= ami-02073841a355a1e92
else ifeq ($(STACK_VERSION),7.2.18)
AWS_SOURCE_AMI ?= ami-02073841a355a1e92
else
AWS_SOURCE_AMI ?= ami-039ce2eddc1949546
endif
Expand Down Expand Up @@ -98,6 +102,8 @@ ifeq ($(CLOUD_PROVIDER),GCP)
ifeq ($(OS),redhat8)
ifeq ($(STACK_VERSION),7.3.1)
GCP_SOURCE_IMAGE ?= rhel-8-byos-v20240709
else ifeq ($(STACK_VERSION),7.2.18)
GCP_SOURCE_IMAGE ?= rhel-8-byos-v20240709
else
GCP_SOURCE_IMAGE ?= rhel-8-byos-v20230615
endif
Expand Down
10 changes: 10 additions & 0 deletions saltstack/final/salt/krb5/init.sls
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,14 @@ disable_kcm_ccache:
disable_sssd_conf_dir:
file.absent:
- name: /etc/krb5.conf.d/enable_sssd_conf_dir

{% if salt['environ.get']('RHEL_VERSION') == '8.10' %}
change_krb5_conf_crypto_policies:
file.managed:
- name: /etc/krb5.conf.d/crypto-policies
- replace: True
- contents: |
[libdefaults]
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
{% endif %}
{% endif %}

0 comments on commit eea2f2b

Please sign in to comment.