Remove or fix outdated/incorrect manila hieradata definitions
- manila::backend::cephfsnative::ceph_client_key was initially used by tripleo::pacemaker::manila class to define Ceph keyring for manila user. During Ocata release this class was adjusted to integrate TripleO with ceph-ansible (change: I2b5567a39ac8737e80758b705818cc1807dc8bf1) and manila::backend::cephfs::ceph_client_key parameter was removed from puppet-tripleo. For some reason, artifact definition was not removed from THT and was renamed to manila::backend::cephfs::ceph_client_key (change: Ib408c7827e5fba0c1b01388db26363806fc64370). At this point this parameter looks meaningless. Partial-Bug: #1916386 Change-Id: Id4fa40a046037a90a72ac1ed1a7e77bd5a636e32
This commit is contained in:
parent
1f128e903d
commit
e2680bbf7e
@ -73,13 +73,6 @@ parameters:
|
||||
# (jprovazn) default value is set to assure this templates works with an
|
||||
# external ceph too (user/key is created only when ceph is deployed by
|
||||
# TripleO)
|
||||
CephManilaClientKey:
|
||||
default: ''
|
||||
description: The Ceph client key. Can be created with ceph-authtool --gen-print-key.
|
||||
type: string
|
||||
hidden: true
|
||||
constraints:
|
||||
- allowed_pattern: "^[a-zA-Z0-9+/]{38}==$"
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
@ -102,6 +95,5 @@ outputs:
|
||||
manila::backend::cephfs::cephfs_cluster_name: {get_param: CephClusterName}
|
||||
manila::backend::cephfs::cephfs_enable_snapshots: {get_param: ManilaCephFSCephFSEnableSnapshots}
|
||||
manila::backend::cephfs::cephfs_volume_mode: {get_param: ManilaCephFSCephVolumeMode}
|
||||
manila::backend::cephfs::ceph_client_key: {get_param: CephManilaClientKey}
|
||||
manila::backend::cephfs::cephfs_protocol_helper_type: {get_param: ManilaCephFSCephFSProtocolHelperType}
|
||||
step_config:
|
||||
|
Loading…
x
Reference in New Issue
Block a user