Merge "Add parameter to set iscsid CHAP algorithms"
This commit is contained in:
commit
cbddc5c367
|
@ -61,6 +61,11 @@ parameters:
|
||||||
type: comma_delimited_list
|
type: comma_delimited_list
|
||||||
tags:
|
tags:
|
||||||
- role_specific
|
- 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:
|
resources:
|
||||||
|
|
||||||
|
@ -88,7 +93,8 @@ outputs:
|
||||||
description: Role data for the Iscsid role.
|
description: Role data for the Iscsid role.
|
||||||
value:
|
value:
|
||||||
service_name: iscsid
|
service_name: iscsid
|
||||||
config_settings: {}
|
config_settings:
|
||||||
|
tripleo::profile::base::iscsid::chap_algs: {get_param: IscsidCHAPAlgorithms}
|
||||||
service_config_settings: {}
|
service_config_settings: {}
|
||||||
deploy_steps_tasks:
|
deploy_steps_tasks:
|
||||||
- name: Run lvmfilter role
|
- name: Run lvmfilter role
|
||||||
|
@ -110,12 +116,16 @@ outputs:
|
||||||
# However, overcloud nodes must have a unique IQN. Allow full
|
# However, overcloud nodes must have a unique IQN. Allow full
|
||||||
# (write) access to /etc/iscsi so that puppet ensures the IQN
|
# (write) access to /etc/iscsi so that puppet ensures the IQN
|
||||||
# is unique and is reset once, and only once.
|
# 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:
|
kolla_config:
|
||||||
/var/lib/kolla/config_files/iscsid.json:
|
/var/lib/kolla/config_files/iscsid.json:
|
||||||
command: /usr/sbin/iscsid -f
|
command: /usr/sbin/iscsid -f
|
||||||
config_files:
|
config_files:
|
||||||
- source: "/var/lib/kolla/config_files/src-iscsid/*"
|
- source: "/var/lib/kolla/config_files/src-iscsid/"
|
||||||
dest: "/etc/iscsi/"
|
dest: "/etc/iscsi/"
|
||||||
merge: true
|
merge: true
|
||||||
preserve_properties: true
|
preserve_properties: true
|
||||||
|
@ -138,7 +148,7 @@ outputs:
|
||||||
- /run/:/run/
|
- /run/:/run/
|
||||||
- /sys:/sys
|
- /sys:/sys
|
||||||
- /lib/modules:/lib/modules:ro
|
- /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
|
- /etc/target:/etc/target:z
|
||||||
- /var/lib/iscsi:/var/lib/iscsi:z
|
- /var/lib/iscsi:/var/lib/iscsi:z
|
||||||
environment:
|
environment:
|
||||||
|
|
Loading…
Reference in New Issue