auth_file: Clean up deprecated *_domain parameters

... because these were deprecated during Ussuri cycle.

Change-Id: I59220d576e37af99a3f9fb87c94dfe3433c6661b

manifests/auth_file.pp

@@ -115,14 +115,6 @@
 #
 # DEPRECATED PARAMETERS
 #
-# [*project_domain*]
-#   (Optional) Project domain in v3 api.
-#   Defaults to 'Default'.
-#
-# [*user_domain*]
-#   (Optional) User domain in v3 api.
-#   Defaults to 'Default'.
-#
 # [*tenant_name*]
 #   (Optional) Tenant for this account as defined in keystone
 #   Defaults to undef.
@@ -155,27 +147,9 @@ class openstack_extras::auth_file (
   $identity_api_version   = '3',
   $object_api_version     = undef,
   # DEPRECATED PARAMETERS
-  $project_domain         = undef,
-  $user_domain            = undef,
   $tenant_name            = undef,
 ) {
 
-  if $project_domain != undef {
-    warning('project_domain is deprecated and will be removed in a future release. \
-Use project_domain_name instead')
-    $project_domain_name_real = $project_domain
-  } else {
-    $project_domain_name_real = $project_domain_name
-  }
-
-  if $user_domain != undef {
-    warning('user_domain is deprecated and will be removed in a future release. \
-Use user_domain_name instead')
-    $user_domain_name_real = $user_domain
-  } else {
-    $user_domain_name_real = $user_domain_name
-  }
-
   if $tenant_name != undef {
     warning('tenant_name is deprecated and will be removed in a future release. \
 Use project_name instead')

releasenotes/notes/remove-domain_name-2a9dee69a7334eab.yaml

@@ -0,0 +1,8 @@
+---
+upgrade:
+  - |
+    The following parameters of the ``openstack_extras::auth_file`` class have
+    been removed.
+
+    - ``project_domain``
+    - ``user_domain``

templates/openrc.erb

@@ -15,11 +15,11 @@ export OS_PASSWORD='<%= @password.gsub(/'/){ %q(\') } %>'
 export OS_AUTH_URL='<%= @auth_url %>'
 export OS_AUTH_STRATEGY='<%= @auth_strategy %>'
 export OS_REGION_NAME='<%= @region_name %>'
-<% if @project_domain_name_real -%>
+<% if @project_domain_name -%>
-export OS_PROJECT_DOMAIN_NAME='<%= @project_domain_name_real %>'
+export OS_PROJECT_DOMAIN_NAME='<%= @project_domain_name %>'
 <% end -%>
-<% if @user_domain_name_real -%>
+<% if @user_domain_name -%>
-export OS_USER_DOMAIN_NAME='<%= @user_domain_name_real %>'
+export OS_USER_DOMAIN_NAME='<%= @user_domain_name %>'
 <% end -%>
 <% if @auth_type -%>
 export OS_AUTH_TYPE='<%= @auth_type %>'