Merge "Deprecate auth_uri option"

manifests/keystone/authtoken.pp

@@ -41,7 +41,7 @@
 #   (Optional) Authentication type to load
 #   Defaults to 'password'.
 #
-# [*auth_uri*]
+# [*www_authenticate_uri*]
 #   (Optional) Complete public Identity API endpoint.
 #   Defaults to 'http://localhost:5000'.
 #
@@ -177,6 +177,12 @@
 #   (in seconds). Set to -1 to disable caching completely. Integer value
 #   Defaults to $::os_service_default.
 #
+# DEPRECATED PARAMETERS
+#
+# [*auth_uri*]
+#   (Optional) Complete public Identity API endpoint.
+#   Defaults to undef
+#
 class cloudkitty::keystone::authtoken(
   $password,
   $username                       = 'cloudkitty',
@@ -187,7 +193,7 @@ class cloudkitty::keystone::authtoken(
   $insecure                       = $::os_service_default,
   $auth_section                   = $::os_service_default,
   $auth_type                      = 'password',
-  $auth_uri                       = 'http://localhost:5000',
+  $www_authenticate_uri           = 'http://localhost:5000',
   $auth_version                   = $::os_service_default,
   $cache                          = $::os_service_default,
   $cafile                         = $::os_service_default,
@@ -212,16 +218,23 @@ class cloudkitty::keystone::authtoken(
   $manage_memcache_package        = false,
   $region_name                    = $::os_service_default,
   $token_cache_time               = $::os_service_default,
+  # DEPRECATED PARAMETERS
+  $auth_uri                       = undef,
 ) {
 
   include ::cloudkitty::deps
 
+  if $auth_uri {
+    warning('The auth_uri parameter is deprecated. Please use www_authenticate_uri instead.')
+  }
+  $www_authenticate_uri_real = pick($auth_uri, $www_authenticate_uri)
+
   keystone::resource::authtoken { 'cloudkitty_config':
     username                       => $username,
     password                       => $password,
     project_name                   => $project_name,
     auth_url                       => $auth_url,
-    auth_uri                       => $auth_uri,
+    www_authenticate_uri           => $www_authenticate_uri_real,
     auth_version                   => $auth_version,
     auth_type                      => $auth_type,
     auth_section                   => $auth_section,

releasenotes/notes/deprecate_auth_uri_parameter-bff05ab392c34eed.yaml

@@ -0,0 +1,4 @@
+---
+deprecations:
+  - auth_uri is deprecated and will be removed in a future release.
+    Please use www_authenticate_uri instead.

spec/classes/cloudkitty_keystone_authtoken_spec.rb

@@ -20,7 +20,7 @@ describe 'cloudkitty::keystone::authtoken' do
         is_expected.to contain_cloudkitty_config('keystone_authtoken/insecure').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_cloudkitty_config('keystone_authtoken/auth_section').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_cloudkitty_config('keystone_authtoken/auth_type').with_value('password')
-        is_expected.to contain_cloudkitty_config('keystone_authtoken/auth_uri').with_value('http://localhost:5000')
+        is_expected.to contain_cloudkitty_config('keystone_authtoken/www_authenticate_uri').with_value('http://localhost:5000')
         is_expected.to contain_cloudkitty_config('keystone_authtoken/auth_version').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_cloudkitty_config('keystone_authtoken/cache').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_cloudkitty_config('keystone_authtoken/cafile').with_value('<SERVICE DEFAULT>')
@@ -50,7 +50,7 @@ describe 'cloudkitty::keystone::authtoken' do
     context 'when overriding parameters' do
       before do
         params.merge!({
-          :auth_uri                       => 'https://10.0.0.1:9999/',
+          :www_authenticate_uri           => 'https://10.0.0.1:9999/',
           :username                       => 'myuser',
           :password                       => 'mypasswd',
           :auth_url                       => 'https://127.0.0.1:35357',
@@ -88,7 +88,7 @@ describe 'cloudkitty::keystone::authtoken' do
       end
 
       it 'configure keystone_authtoken' do
-        is_expected.to contain_cloudkitty_config('keystone_authtoken/auth_uri').with_value('https://10.0.0.1:9999/')
+        is_expected.to contain_cloudkitty_config('keystone_authtoken/www_authenticate_uri').with_value('https://10.0.0.1:9999/')
         is_expected.to contain_cloudkitty_config('keystone_authtoken/username').with_value(params[:username])
         is_expected.to contain_cloudkitty_config('keystone_authtoken/password').with_value(params[:password]).with_secret(true)
         is_expected.to contain_cloudkitty_config('keystone_authtoken/auth_url').with_value(params[:auth_url])