Fix parameter name used to create the Manila CephX keyring
We obsoleted the CephFS native parameter but missed to update it
in the Ceph profile.
Change-Id: I12a91da7df6079d391fa9583c4f2c926d123044f
Closes-Bug: #1783341
(cherry picked from commit 787e7910a8
)
This commit is contained in:
parent
9cfc081e94
commit
8d48f8317d
|
@ -131,7 +131,7 @@ parameters:
|
||||||
description: default minimum replication for RBD copies
|
description: default minimum replication for RBD copies
|
||||||
type: number
|
type: number
|
||||||
default: 3
|
default: 3
|
||||||
ManilaCephFSNativeCephFSAuthId:
|
ManilaCephFSCephFSAuthId:
|
||||||
default: manila
|
default: manila
|
||||||
type: string
|
type: string
|
||||||
CephManilaClientKey:
|
CephManilaClientKey:
|
||||||
|
@ -296,7 +296,7 @@ outputs:
|
||||||
list_join:
|
list_join:
|
||||||
- '.'
|
- '.'
|
||||||
- - client
|
- - client
|
||||||
- {get_param: ManilaCephFSNativeCephFSAuthId}
|
- {get_param: ManilaCephFSCephFSAuthId}
|
||||||
key: {get_param: CephManilaClientKey}
|
key: {get_param: CephManilaClientKey}
|
||||||
mgr_cap: "allow *"
|
mgr_cap: "allow *"
|
||||||
mon_cap: 'allow r, allow command \"auth del\", allow command \"auth caps\", allow command \"auth get\", allow command \"auth get-or-create\"'
|
mon_cap: 'allow r, allow command \"auth del\", allow command \"auth caps\", allow command \"auth get\", allow command \"auth get-or-create\"'
|
||||||
|
|
|
@ -47,7 +47,7 @@ parameters:
|
||||||
ManilaCephFSMetadataPoolPGNum:
|
ManilaCephFSMetadataPoolPGNum:
|
||||||
default: 128
|
default: 128
|
||||||
type: number
|
type: number
|
||||||
ManilaCephFSNativeShareBackendName:
|
ManilaCephFSShareBackendName:
|
||||||
default: cephfs
|
default: cephfs
|
||||||
type: string
|
type: string
|
||||||
|
|
||||||
|
@ -85,7 +85,7 @@ outputs:
|
||||||
- {get_attr: [CephBase, role_data, config_settings, ceph_common_ansible_vars]}
|
- {get_attr: [CephBase, role_data, config_settings, ceph_common_ansible_vars]}
|
||||||
- cephfs_data: {get_param: ManilaCephFSDataPoolName}
|
- cephfs_data: {get_param: ManilaCephFSDataPoolName}
|
||||||
cephfs_metadata: {get_param: ManilaCephFSMetadataPoolName}
|
cephfs_metadata: {get_param: ManilaCephFSMetadataPoolName}
|
||||||
cephfs: {get_param: ManilaCephFSNativeShareBackendName}
|
cephfs: {get_param: ManilaCephFSShareBackendName}
|
||||||
cephfs_pools:
|
cephfs_pools:
|
||||||
- { name: {get_param: ManilaCephFSDataPoolName}, pgs: {get_param: ManilaCephFSDataPoolPGNum} }
|
- { name: {get_param: ManilaCephFSDataPoolName}, pgs: {get_param: ManilaCephFSDataPoolPGNum} }
|
||||||
- { name: {get_param: ManilaCephFSMetadataPoolName}, pgs: {get_param: ManilaCephFSMetadataPoolPGNum} }
|
- { name: {get_param: ManilaCephFSMetadataPoolName}, pgs: {get_param: ManilaCephFSMetadataPoolPGNum} }
|
||||||
|
|
|
@ -69,7 +69,7 @@ parameters:
|
||||||
description: Mapping of service endpoint -> protocol. Typically set
|
description: Mapping of service endpoint -> protocol. Typically set
|
||||||
via parameter_defaults in the resource registry.
|
via parameter_defaults in the resource registry.
|
||||||
type: json
|
type: json
|
||||||
ManilaCephFSNativeCephFSAuthId:
|
ManilaCephFSCephFSAuthId:
|
||||||
type: string
|
type: string
|
||||||
default: 'manila'
|
default: 'manila'
|
||||||
CephManilaClientKey:
|
CephManilaClientKey:
|
||||||
|
@ -167,7 +167,7 @@ outputs:
|
||||||
CEPH_CLIENT_KEY:
|
CEPH_CLIENT_KEY:
|
||||||
list_join: ['.', ['client', {get_param: CephClientUserName}]]
|
list_join: ['.', ['client', {get_param: CephClientUserName}]]
|
||||||
MANILA_CLIENT_KEY:
|
MANILA_CLIENT_KEY:
|
||||||
list_join: ['.', ['client', {get_param: ManilaCephFSNativeCephFSAuthId}]]
|
list_join: ['.', ['client', {get_param: ManilaCephFSCephFSAuthId}]]
|
||||||
service_config_settings:
|
service_config_settings:
|
||||||
ceph_osd:
|
ceph_osd:
|
||||||
ceph::params::packages:
|
ceph::params::packages:
|
||||||
|
|
|
@ -68,7 +68,7 @@ parameters:
|
||||||
image. Only applies to format 2 images. Set to '1' for Jewel
|
image. Only applies to format 2 images. Set to '1' for Jewel
|
||||||
clients using older Ceph servers.
|
clients using older Ceph servers.
|
||||||
type: string
|
type: string
|
||||||
ManilaCephFSNativeCephFSAuthId:
|
ManilaCephFSCephFSAuthId:
|
||||||
type: string
|
type: string
|
||||||
default: 'manila'
|
default: 'manila'
|
||||||
CephManilaClientKey:
|
CephManilaClientKey:
|
||||||
|
@ -112,7 +112,7 @@ outputs:
|
||||||
CEPH_CLIENT_KEY:
|
CEPH_CLIENT_KEY:
|
||||||
list_join: ['.', ['client', {get_param: CephClientUserName}]]
|
list_join: ['.', ['client', {get_param: CephClientUserName}]]
|
||||||
MANILA_CLIENT_KEY:
|
MANILA_CLIENT_KEY:
|
||||||
list_join: ['.', ['client', {get_param: ManilaCephFSNativeCephFSAuthId}]]
|
list_join: ['.', ['client', {get_param: ManilaCephFSCephFSAuthId}]]
|
||||||
ceph::profile::params::manage_repo: false
|
ceph::profile::params::manage_repo: false
|
||||||
# FIXME(gfidente): we should not have to list the packages explicitly in
|
# FIXME(gfidente): we should not have to list the packages explicitly in
|
||||||
# the templates, but this should stay until the following is fixed:
|
# the templates, but this should stay until the following is fixed:
|
||||||
|
|
|
@ -41,7 +41,7 @@ parameters:
|
||||||
ManilaCephFSMetadataPoolName:
|
ManilaCephFSMetadataPoolName:
|
||||||
default: manila_metadata
|
default: manila_metadata
|
||||||
type: string
|
type: string
|
||||||
ManilaCephFSNativeShareBackendName:
|
ManilaCephFSShareBackendName:
|
||||||
default: cephfs
|
default: cephfs
|
||||||
type: string
|
type: string
|
||||||
|
|
||||||
|
@ -71,6 +71,6 @@ outputs:
|
||||||
- '6800-7300'
|
- '6800-7300'
|
||||||
ceph::profile::params::fs_data_pool: {get_param: ManilaCephFSDataPoolName}
|
ceph::profile::params::fs_data_pool: {get_param: ManilaCephFSDataPoolName}
|
||||||
ceph::profile::params::fs_metadata_pool: {get_param: ManilaCephFSMetadataPoolName}
|
ceph::profile::params::fs_metadata_pool: {get_param: ManilaCephFSMetadataPoolName}
|
||||||
ceph::profile::params::fs_name: {get_param: ManilaCephFSNativeShareBackendName}
|
ceph::profile::params::fs_name: {get_param: ManilaCephFSShareBackendName}
|
||||||
step_config: |
|
step_config: |
|
||||||
include ::tripleo::profile::base::ceph::mds
|
include ::tripleo::profile::base::ceph::mds
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
---
|
||||||
|
deprecations:
|
||||||
|
- |
|
||||||
|
The following parameters are deprecated when deploying Manila with CephFS:
|
||||||
|
ManilaCephFSNativeShareBackendName, use ManilaCephFSShareBackendName instead
|
||||||
|
ManilaCephFSNativeBackendName, use ManilaCephFSBackendName instead
|
||||||
|
ManilaCephFSNativeCephFSAuthId, use ManilaCephFSCephFSAuthId instead
|
||||||
|
ManilaCephFSNativeDriverHandlesShareServers, use ManilaCephFSDriverHandlesShareServers instead
|
||||||
|
ManilaCephFSNativeCephFSEnableSnapshots, use ManilaCephFSCephFSEnableSnapshots instead
|
||||||
|
ManilaCephFSNativeCephFSClusterName, matches CephClusterName parameter
|
||||||
|
ManilaCephFSNativeCephFSConfPath, autogenerated from CephClusterName
|
Loading…
Reference in New Issue