diff --git a/ci/environments/scenario004-standalone.yaml b/ci/environments/scenario004-standalone.yaml index 33f6201971..30103b2753 100644 --- a/ci/environments/scenario004-standalone.yaml +++ b/ci/environments/scenario004-standalone.yaml @@ -67,8 +67,6 @@ parameter_defaults: CephAnsibleEnvironmentVariables: ANSIBLE_SSH_RETRIES: 4 DEFAULT_FORKS: 3 - ManilaCephFSDataPoolPGNum: 16 - ManilaCephFSMetadataPoolPGNum: 16 NovaEnableRbdBackend: true GlanceBackend: rbd CeilometerEnableGnocchi: true diff --git a/deployment/ceph-ansible/ceph-base.yaml b/deployment/ceph-ansible/ceph-base.yaml index bb412a947a..f83e657153 100644 --- a/deployment/ceph-ansible/ceph-base.yaml +++ b/deployment/ceph-ansible/ceph-base.yaml @@ -170,14 +170,6 @@ parameters: ManilaCephFSMetadataPoolName: default: manila_metadata type: string - # start DEPRECATED options for compatibility with older versions - ManilaCephFSDataPoolPGNum: - default: 128 - type: number - ManilaCephFSMetadataPoolPGNum: - default: 128 - type: number - # end DEPRECATED options for compatibility with older versions ManilaCephFSShareBackendName: default: cephfs type: string @@ -333,16 +325,12 @@ parameter_groups: - label: deprecated description: Do not use deprecated params, they will be removed. parameters: - - ManilaCephFSDataPoolPGNum - - ManilaCephFSMetadataPoolPGNum - LocalCephAnsibleFetchDirectoryBackup - SwiftFetchDirGetTempurl - SwiftFetchDirPutTempurl - CephIPv6 conditions: - deprecated_data_pool_pgnum: {not: {equals: [{get_param: ManilaCephFSDataPoolPGNum}, 128]}} - deprecated_metadata_pool_pgnum: {not: {equals: [{get_param: ManilaCephFSMetadataPoolPGNum}, 128]}} dashboard_is_enabled: {equals: [{get_param: CephEnableDashboard}, true]} custom_registry_host: yaql: @@ -469,16 +457,8 @@ resources: vars: data: {get_param: ManilaCephFSDataPoolName} metadata: {get_param: ManilaCephFSMetadataPoolName} - data_pg_num: - if: - - deprecated_data_pool_pgnum - - {get_param: ManilaCephFSDataPoolPGNum} - - {get_param: CephPoolDefaultPgNum} - metadata_pg_num: - if: - - deprecated_metadata_pool_pgnum - - {get_param: ManilaCephFSMetadataPoolPGNum} - - {get_param: CephPoolDefaultPgNum} + data_pg_num: {get_param: CephPoolDefaultPgNum} + metadata_pg_num: {get_param: CephPoolDefaultPgNum} CephKeyVars: type: OS::Heat::Value diff --git a/environments/low-memory-usage.yaml b/environments/low-memory-usage.yaml index b81db94dca..1b08737611 100644 --- a/environments/low-memory-usage.yaml +++ b/environments/low-memory-usage.yaml @@ -24,7 +24,5 @@ parameter_defaults: # Override defaults to get HEALTH_OK with 1 OSD (for testing only) CephPoolDefaultSize: 1 CephPoolDefaultPgNum: 16 - ManilaCephFSDataPoolPGNum: 16 - ManilaCephFSMetadataPoolPGNum: 16 NovaReservedHostMemory: 512 diff --git a/releasenotes/notes/remove-deprecated-manila-ceph-pgnum-parameters-b7bb9c95e30467d5.yaml b/releasenotes/notes/remove-deprecated-manila-ceph-pgnum-parameters-b7bb9c95e30467d5.yaml new file mode 100644 index 0000000000..c257f57ba7 --- /dev/null +++ b/releasenotes/notes/remove-deprecated-manila-ceph-pgnum-parameters-b7bb9c95e30467d5.yaml @@ -0,0 +1,7 @@ +--- +upgrade: + - | + The deprecated``ManilaCephFSDataPoolPGNum`` and ``ManilaCephFSMetadataPoolPGNum`` + parameters have been removed. As with the other Ceph pools, use the + ``CephPoolDefaultPgNum`` parameter for the default value, or ``CephPools`` + to override pg_num for specific pools.