Commit d7a433c 1 parent 370fab1 commit d7a433c Copy full SHA for d7a433c
File tree 2 files changed +16
-0
lines changed
saltstack/final/salt/krb5
2 files changed +16
-0
lines changed Original file line number Diff line number Diff line change @@ -47,6 +47,8 @@ $(error "AZURE_IMAGE_VHD and Marketplace image properties (AZURE_IMAGE_PUBLISHER
47
47
# CB-26812: Temp rollback!
48
48
# AZURE_IMAGE_SKU ?= rhel-lvm10
49
49
AZURE_IMAGE_SKU ?= rhel-lvm88
50
+ else ifeq ($(STACK_VERSION),7.2.18)
51
+ AZURE_IMAGE_SKU ?= rhel-lvm810
50
52
else
51
53
AZURE_IMAGE_SKU ?= rhel-lvm88
52
54
endif
@@ -77,6 +79,8 @@ ifeq ($(CLOUD_PROVIDER),AWS)
77
79
# CB-26812: Temp rollback!
78
80
# AWS_SOURCE_AMI ?= ami-02073841a355a1e92
79
81
AWS_SOURCE_AMI ?= ami-039ce2eddc1949546
82
+ else ifeq ($(STACK_VERSION),7.2.18)
83
+ AWS_SOURCE_AMI ?= ami-02073841a355a1e92
80
84
else
81
85
AWS_SOURCE_AMI ?= ami-039ce2eddc1949546
82
86
endif
@@ -106,6 +110,8 @@ ifeq ($(CLOUD_PROVIDER),GCP)
106
110
# CB-26812: Temp rollback!
107
111
# GCP_SOURCE_IMAGE ?= rhel-8-byos-v20240709
108
112
GCP_SOURCE_IMAGE ?= rhel-8-byos-v20230615
113
+ else ifeq ($(STACK_VERSION),7.2.18)
114
+ GCP_SOURCE_IMAGE ?= rhel-8-byos-v20240709
109
115
else
110
116
GCP_SOURCE_IMAGE ?= rhel-8-byos-v20230615
111
117
endif
Original file line number Diff line number Diff line change @@ -8,4 +8,14 @@ disable_kcm_ccache:
8
8
disable_sssd_conf_dir:
9
9
file.absent :
10
10
- 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 %}
11
21
{% endif %}
You can’t perform that action at this time.
0 commit comments