From 8d48f8317d98c8d49d4f73fd7653a8104fdd9406 Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Tue, 24 Jul 2018 23:53:57 +0200 Subject: [PATCH] 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 787e7910a8e277a3be7eab0a632ec5746bf6a27d) --- docker/services/ceph-ansible/ceph-base.yaml | 4 ++-- docker/services/ceph-ansible/ceph-mds.yaml | 4 ++-- puppet/services/ceph-base.yaml | 4 ++-- puppet/services/ceph-external.yaml | 4 ++-- puppet/services/ceph-mds.yaml | 4 ++-- ...nila-cephfsnative-parameters-e24978c8b344573b.yaml | 11 +++++++++++ 6 files changed, 21 insertions(+), 10 deletions(-) create mode 100644 releasenotes/notes/deprecate-manila-cephfsnative-parameters-e24978c8b344573b.yaml diff --git a/docker/services/ceph-ansible/ceph-base.yaml b/docker/services/ceph-ansible/ceph-base.yaml index 1ecbbb0092..d3ccb412d3 100644 --- a/docker/services/ceph-ansible/ceph-base.yaml +++ b/docker/services/ceph-ansible/ceph-base.yaml @@ -131,7 +131,7 @@ parameters: description: default minimum replication for RBD copies type: number default: 3 - ManilaCephFSNativeCephFSAuthId: + ManilaCephFSCephFSAuthId: default: manila type: string CephManilaClientKey: @@ -296,7 +296,7 @@ outputs: list_join: - '.' - - client - - {get_param: ManilaCephFSNativeCephFSAuthId} + - {get_param: ManilaCephFSCephFSAuthId} key: {get_param: CephManilaClientKey} 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\"' diff --git a/docker/services/ceph-ansible/ceph-mds.yaml b/docker/services/ceph-ansible/ceph-mds.yaml index c0ccd9e2fe..a325c65809 100644 --- a/docker/services/ceph-ansible/ceph-mds.yaml +++ b/docker/services/ceph-ansible/ceph-mds.yaml @@ -47,7 +47,7 @@ parameters: ManilaCephFSMetadataPoolPGNum: default: 128 type: number - ManilaCephFSNativeShareBackendName: + ManilaCephFSShareBackendName: default: cephfs type: string @@ -85,7 +85,7 @@ outputs: - {get_attr: [CephBase, role_data, config_settings, ceph_common_ansible_vars]} - cephfs_data: {get_param: ManilaCephFSDataPoolName} cephfs_metadata: {get_param: ManilaCephFSMetadataPoolName} - cephfs: {get_param: ManilaCephFSNativeShareBackendName} + cephfs: {get_param: ManilaCephFSShareBackendName} cephfs_pools: - { name: {get_param: ManilaCephFSDataPoolName}, pgs: {get_param: ManilaCephFSDataPoolPGNum} } - { name: {get_param: ManilaCephFSMetadataPoolName}, pgs: {get_param: ManilaCephFSMetadataPoolPGNum} } diff --git a/puppet/services/ceph-base.yaml b/puppet/services/ceph-base.yaml index dc3f2a5051..8007fe74cc 100644 --- a/puppet/services/ceph-base.yaml +++ b/puppet/services/ceph-base.yaml @@ -69,7 +69,7 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json - ManilaCephFSNativeCephFSAuthId: + ManilaCephFSCephFSAuthId: type: string default: 'manila' CephManilaClientKey: @@ -167,7 +167,7 @@ outputs: CEPH_CLIENT_KEY: list_join: ['.', ['client', {get_param: CephClientUserName}]] MANILA_CLIENT_KEY: - list_join: ['.', ['client', {get_param: ManilaCephFSNativeCephFSAuthId}]] + list_join: ['.', ['client', {get_param: ManilaCephFSCephFSAuthId}]] service_config_settings: ceph_osd: ceph::params::packages: diff --git a/puppet/services/ceph-external.yaml b/puppet/services/ceph-external.yaml index 2356a5f5ca..08a6c5aa35 100644 --- a/puppet/services/ceph-external.yaml +++ b/puppet/services/ceph-external.yaml @@ -68,7 +68,7 @@ parameters: image. Only applies to format 2 images. Set to '1' for Jewel clients using older Ceph servers. type: string - ManilaCephFSNativeCephFSAuthId: + ManilaCephFSCephFSAuthId: type: string default: 'manila' CephManilaClientKey: @@ -112,7 +112,7 @@ outputs: CEPH_CLIENT_KEY: list_join: ['.', ['client', {get_param: CephClientUserName}]] MANILA_CLIENT_KEY: - list_join: ['.', ['client', {get_param: ManilaCephFSNativeCephFSAuthId}]] + list_join: ['.', ['client', {get_param: ManilaCephFSCephFSAuthId}]] ceph::profile::params::manage_repo: false # FIXME(gfidente): we should not have to list the packages explicitly in # the templates, but this should stay until the following is fixed: diff --git a/puppet/services/ceph-mds.yaml b/puppet/services/ceph-mds.yaml index f48c71118a..98bb3ec5de 100644 --- a/puppet/services/ceph-mds.yaml +++ b/puppet/services/ceph-mds.yaml @@ -41,7 +41,7 @@ parameters: ManilaCephFSMetadataPoolName: default: manila_metadata type: string - ManilaCephFSNativeShareBackendName: + ManilaCephFSShareBackendName: default: cephfs type: string @@ -71,6 +71,6 @@ outputs: - '6800-7300' ceph::profile::params::fs_data_pool: {get_param: ManilaCephFSDataPoolName} 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: | include ::tripleo::profile::base::ceph::mds diff --git a/releasenotes/notes/deprecate-manila-cephfsnative-parameters-e24978c8b344573b.yaml b/releasenotes/notes/deprecate-manila-cephfsnative-parameters-e24978c8b344573b.yaml new file mode 100644 index 0000000000..79a0e9275f --- /dev/null +++ b/releasenotes/notes/deprecate-manila-cephfsnative-parameters-e24978c8b344573b.yaml @@ -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