Merge "Provide consisent default name for service_identity resource"

manifests/keystone/auth.pp

@@ -77,20 +77,19 @@ class glance::keystone::auth(
   $internal_url        = 'http://127.0.0.1:9292',
 ) {
 
-  $real_service_name = pick($service_name, $auth_name)
-
   if $configure_endpoint {
-    Keystone_endpoint["${region}/${real_service_name}::${service_type}"]  ~> Service<| title == 'glance-api' |>
-    Keystone_endpoint["${region}/${real_service_name}::${service_type}"] -> Glance_image<||>
+    Keystone_endpoint["${region}/${service_name}::${service_type}"]  ~> Service<| title == 'glance-api' |>
+    Keystone_endpoint["${region}/${service_name}::${service_type}"] -> Glance_image<||>
   }
 
-  keystone::resource::service_identity { $auth_name:
+  keystone::resource::service_identity { 'glance':
     configure_user      => $configure_user,
     configure_user_role => $configure_user_role,
     configure_endpoint  => $configure_endpoint,
     service_type        => $service_type,
     service_description => $service_description,
-    service_name        => $real_service_name,
+    service_name        => $service_name,
+    auth_name           => $auth_name,
     region              => $region,
     password            => $password,
     email               => $email,

manifests/keystone/glare_auth.pp

@@ -76,19 +76,18 @@ class glance::keystone::glare_auth(
   $internal_url        = 'http://127.0.0.1:9494',
 ) {
 
-  $real_service_name = pick($service_name, $auth_name)
-
   if $configure_endpoint {
-    Keystone_endpoint["${region}/${real_service_name}::${service_type}"]  ~> Service<| title == 'glance-glare' |>
+    Keystone_endpoint["${region}/${service_name}::${service_type}"]  ~> Service<| title == 'glance-glare' |>
   }
 
-  keystone::resource::service_identity { $auth_name:
+  keystone::resource::service_identity { 'glare':
     configure_user      => $configure_user,
     configure_user_role => $configure_user_role,
     configure_endpoint  => $configure_endpoint,
     service_type        => $service_type,
     service_description => $service_description,
-    service_name        => $real_service_name,
+    service_name        => $service_name,
+    auth_name           => $auth_name,
     region              => $region,
     password            => $password,
     email               => $email,

releasenotes/notes/keystone-auth-name-2f9bd1b22dccd5bf.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - The keystone auth classes (for glance and glare) has been updated to be
+    able to specify a custom auth_name that may not contain the name of the
+    service.