Rename swift_tenant_name to swift_project_name

... because the swift_tenant_name parameter in gnocchi was already
deprecated[1].

[1] 5474eaecce

Change-Id: I4b6f7a33f8ead70e1bf1afb3088ba9e552b1875a

manifests/storage/swift.pp

@@ -37,7 +37,7 @@
 #   (optional) Swift key.
 #   Defaults to 'admin'
 #
-# [*swift_tenant_name*]
+# [*swift_project_name*]
 #   (optional) Swift tenant name, only used if swift_auth_version is '2'.
 #   Defaults to undef
 #
@@ -46,22 +46,38 @@
 #   (publicURL, internalURL or adminURL).
 #   Defaults to undef
 #
+# DEPRECATED PARAMETERS
+#
+# [*swift_tenant_name*]
+#   (optional) Swift tenant name, only used if swift_auth_version is '2'.
+#   Defaults to undef
+#
 class gnocchi::storage::swift(
   $swift_auth_version  = '1',
   $swift_authurl       = 'http://localhost:8080/auth/v1.0',
   $swift_user          = 'admin:admin',
   $swift_key           = 'admin',
-  $swift_tenant_name   = undef,
+  $swift_project_name  = undef,
   $swift_endpoint_type = $::os_service_default,
+  # DEPRECATED PARAMETERS
+  $swift_tenant_name   = undef,
 ) {
 
   include gnocchi::deps
 
+  if $swift_tenant_name != undef {
+    warning('gnocchi::storage::swift::swift_tenant_name is deprecated and \
+will be removed in a future release. Use swift_project_name instead')
+    $swift_project_name_real = $swift_tenant_name
+  } else {
+    $swift_project_name_real = $swift_project_name
+  }
+
   gnocchi_config {
     'storage/driver':              value => 'swift';
     'storage/swift_user':          value => $swift_user;
     'storage/swift_key':           value => $swift_key;
-    'storage/swift_tenant_name':   value => $swift_tenant_name;
+    'storage/swift_project_name':  value => $swift_project_name_real;
     'storage/swift_auth_version':  value => $swift_auth_version;
     'storage/swift_authurl':       value => $swift_authurl;
     'storage/swift_endpoint_type': value => $swift_endpoint_type;

releasenotes/notes/storage-swift_project_name-5c00b6eea8e4b009.yaml

@@ -0,0 +1,6 @@
+---
+deprecations:
+  - |
+    The ``gnocchi::storage::swift::auth_tenant_name`` parameter was deprecated
+    and will be remove in a future release. Use the ``auth_project_name``
+    parameter instead.

spec/classes/gnocchi_storage_swift_spec.rb

@@ -17,6 +17,7 @@ describe 'gnocchi::storage::swift' do
         is_expected.to contain_gnocchi_config('storage/swift_user').with_value('admin:admin')
         is_expected.to contain_gnocchi_config('storage/swift_key').with_value('admin')
         is_expected.to contain_gnocchi_config('storage/swift_authurl').with_value('http://localhost:8080/auth/v1.0')
+        is_expected.to contain_gnocchi_config('storage/swift_project_name').with_value(nil)
         is_expected.to contain_gnocchi_config('storage/swift_auth_version').with_value('1')
         is_expected.to contain_gnocchi_config('storage/swift_endpoint_type').with_value('<SERVICE DEFAULT>')
       end