X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fkeystone%2Fmanifests%2Fendpoint.pp;h=ddf5c1368d9870da265de2cb362ad101cf95a9e9;hb=b0c5fa1bf27e28d72c80d56c0c84f7d301aaaac6;hp=c713800f1e4510b0db1e9354d3cb8f9d7acbba2d;hpb=4631045ebb77ee8622f6fa09277a50c372bcc02e;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/keystone/manifests/endpoint.pp b/3rdparty/modules/keystone/manifests/endpoint.pp
index c713800f1..ddf5c1368 100644
--- a/3rdparty/modules/keystone/manifests/endpoint.pp
+++ b/3rdparty/modules/keystone/manifests/endpoint.pp
@@ -22,45 +22,19 @@
 # [*version*]
 #   (optional) API version for endpoint. Appended to all endpoint urls. (Defaults to 'v2.0')
 #
-# [*public_protocol*]
-#   (optional) DEPRECATED: Use public_url instead.
-#   Protocol for public access to keystone endpoint. (Defaults to 'http')
-#   Setting this parameter overrides public_url parameter.
+# [*user_domain*]
+#   (Optional) Domain for $auth_name
+#   Defaults to undef (use the keystone server default domain)
 #
-# [*public_address*]
-#   (optional) DEPRECATED: Use public_url instead.
-#   Public address for keystone endpoint. (Defaults to '127.0.0.1')
-#   Setting this parameter overrides public_url parameter.
+# [*project_domain*]
+#   (Optional) Domain for $tenant (project)
+#   Defaults to undef (use the keystone server default domain)
 #
-# [*public_port*]
-#   (optional) DEPRECATED: Use public_url instead.
-#   Port for non-admin access to keystone endpoint. (Defaults to 5000)
-#   Setting this parameter overrides public_url parameter.
-#
-# [*internal_address*]
-#   (optional) DEPRECATED: Use internal_url instead.
-#   Internal address for keystone endpoint. (Defaults to '127.0.0.1')
-#   Setting this parameter overrides internal_url parameter.
-#
-# [*internal_port*]
-#   (optional) DEPRECATED: Use internal_url instead.
-#   Port for internal access to keystone endpoint. (Defaults to $public_port)
-#   Setting this parameter overrides internal_url parameter.
-#
-# [*admin_address*]
-#   (optional) DEPRECATED: Use admin_url instead.
-#   Admin address for keystone endpoint. (Defaults to '127.0.0.1')
-#   Setting this parameter overrides admin_url parameter.
-#
-# [*admin_port*]
-#   (optional) DEPRECATED: Use admin_url instead.
-#   Port for admin access to keystone endpoint. (Defaults to 35357)
-#   Setting this parameter overrides admin_url parameter.
-#
-# === Deprecation notes
-#
-# If any value is provided for public_protocol, public_address or public_port parameters,
-# public_url will be completely ignored. The same applies for internal and admin parameters.
+# [*default_domain*]
+#   (Optional) Domain for $auth_name and $tenant (project)
+#   If keystone_user_domain is not specified, use $keystone_default_domain
+#   If keystone_project_domain is not specified, use $keystone_default_domain
+#   Defaults to undef
 #
 # === Examples
 #
@@ -76,76 +50,20 @@ class keystone::endpoint (
   $admin_url         = 'http://127.0.0.1:35357',
   $version           = 'v2.0',
   $region            = 'RegionOne',
-  # DEPRECATED PARAMETERS
-  $public_protocol   = undef,
-  $public_address    = undef,
-  $public_port       = undef,
-  $internal_address  = undef,
-  $internal_port     = undef,
-  $admin_address     = undef,
-  $admin_port        = undef,
+  $user_domain       = undef,
+  $project_domain    = undef,
+  $default_domain    = undef,
 ) {
 
-  warning('keystone::endpoint class is deprecated, use keystone::resource::service_identity instead.')
+  $public_url_real = "${public_url}/${version}"
+  $admin_url_real = "${admin_url}/${version}"
 
-  if $public_port {
-    warning('The public_port parameter is deprecated, use public_url instead.')
+  if $internal_url {
+    $internal_url_real = "${internal_url}/${version}"
+  } else {
+    $internal_url_real = "${public_url}/${version}"
   }
 
-  if $public_protocol {
-    warning('The public_protocol parameter is deprecated, use public_url instead.')
-  }
-
-  if $public_address {
-    warning('The public_address parameter is deprecated, use public_url instead.')
-  }
-
-  if $internal_address {
-    warning('The internal_address parameter is deprecated, use internal_url instead.')
-  }
-
-  if $internal_port {
-    warning('The internal_port parameter is deprecated, use internal_url instead.')
-  }
-
-  if $admin_address {
-    warning('The admin_address parameter is deprecated, use admin_url instead.')
-  }
-
-  if $admin_port {
-    warning('The admin_port parameter is deprecated, use admin_url instead.')
-  }
-
-  $public_url_real = inline_template('<%=
-    if (!@public_protocol.nil?) || (!@public_address.nil?) || (!@public_port.nil?)
-      @public_protocol ||= "http"
-      @public_address ||= "127.0.0.1"
-      @public_port ||= "5000"
-      "#{@public_protocol}://#{@public_address}:#{@public_port}/#{@version}"
-    else
-      "#{@public_url}/#{@version}"
-    end %>')
-
-  $internal_url_real = inline_template('<%=
-    if (!@internal_address.nil?) || (!@internal_port.nil?) || (!@public_port.nil?)
-      @internal_address ||= @public_address ||= "127.0.0.1"
-      @internal_port ||= @public_port ||= "5000"
-      "http://#{@internal_address}:#{@internal_port}/#{@version}"
-    elsif (!@internal_url.nil?)
-      "#{@internal_url}/#{@version}"
-    else
-      "#{@public_url}/#{@version}"
-    end %>')
-
-  $admin_url_real = inline_template('<%=
-    if (!@admin_address.nil?) || (!@admin_port.nil?)
-      @admin_address ||= "127.0.0.1"
-      @admin_port ||= "35357"
-      "http://#{@admin_address}:#{@admin_port}/#{@version}"
-    else
-      "#{@admin_url}/#{@version}"
-    end %>')
-
   keystone::resource::service_identity { 'keystone':
     configure_user      => false,
     configure_user_role => false,
@@ -155,6 +73,9 @@ class keystone::endpoint (
     admin_url           => $admin_url_real,
     internal_url        => $internal_url_real,
     region              => $region,
+    user_domain         => $user_domain,
+    project_domain      => $project_domain,
+    default_domain      => $default_domain,
   }
 
 }