Merge "Add parameter to set iscsid CHAP algorithms"

This commit is contained in:
Zuul 2021-04-07 11:06:05 +00:00 committed by Gerrit Code Review
commit cbddc5c367
1 changed files with 14 additions and 4 deletions

View File

@ -61,6 +61,11 @@ parameters:
type: comma_delimited_list
tags:
- role_specific
IscsidCHAPAlgorithms:
default: 'SHA3-256,SHA256,SHA1,MD5'
description: A comma separated list of algorithms to be used for the CHAP
algorithm.
type: string
resources:
@ -88,7 +93,8 @@ outputs:
description: Role data for the Iscsid role.
value:
service_name: iscsid
config_settings: {}
config_settings:
tripleo::profile::base::iscsid::chap_algs: {get_param: IscsidCHAPAlgorithms}
service_config_settings: {}
deploy_steps_tasks:
- name: Run lvmfilter role
@ -110,12 +116,16 @@ outputs:
# However, overcloud nodes must have a unique IQN. Allow full
# (write) access to /etc/iscsi so that puppet ensures the IQN
# is unique and is reset once, and only once.
- /etc/iscsi:/etc/iscsi:z
# NOTE(abishop) The host directory is mounted at /tmp/iscsi.host
# to allow puppet to manage its own files, but still be able to
# sync with the host. See I89023603147e21d5c211041f70fc2c988d5f4de1
# for details.
- /etc/iscsi:/tmp/iscsi.host:z
kolla_config:
/var/lib/kolla/config_files/iscsid.json:
command: /usr/sbin/iscsid -f
config_files:
- source: "/var/lib/kolla/config_files/src-iscsid/*"
- source: "/var/lib/kolla/config_files/src-iscsid/"
dest: "/etc/iscsi/"
merge: true
preserve_properties: true
@ -138,7 +148,7 @@ outputs:
- /run/:/run/
- /sys:/sys
- /lib/modules:/lib/modules:ro
- /etc/iscsi:/var/lib/kolla/config_files/src-iscsid:ro
- /var/lib/config-data/puppet-generated/iscsid/etc/iscsi:/var/lib/kolla/config_files/src-iscsid:ro
- /etc/target:/etc/target:z
- /var/lib/iscsi:/var/lib/iscsi:z
environment: