From 43a2ed4380a8ef0a2e6c64d4ad08193da6f75eca Mon Sep 17 00:00:00 2001
From: Christopher Brown <chrisbro@redhat.com>
Date: Tue, 20 Oct 2020 09:00:54 +1000
Subject: [PATCH] Add support for the keystone_authtoken/service_type parameter

Change-Id: I940575abfc2e21595143cf0fe12044b40d9de383
---
 manifests/keystone/authtoken.pp                            | 7 +++++++
 .../keystone-authtoken-service_type-2cdc4de207123029.yaml  | 5 +++++
 spec/classes/neutron_keystone_authtoken_spec.rb            | 3 +++
 3 files changed, 15 insertions(+)
 create mode 100644 releasenotes/notes/keystone-authtoken-service_type-2cdc4de207123029.yaml

diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp
index 2c8dcb1f0..6c5710035 100644
--- a/manifests/keystone/authtoken.pp
+++ b/manifests/keystone/authtoken.pp
@@ -177,6 +177,11 @@
 #   true/false
 #   Defaults to $::os_service_default.
 #
+# [*service_type*]
+#  (Optional) The name or type of the service as it appears in the service
+#  catalog. This is used to validate tokens that have restricted access rules.
+#  Defaults to $::os_service_default.
+#
 # [*interface*]
 #  (Optional) Interface to use for the Identity API endpoint. Valid values are
 #  "public", "internal" or "admin".
@@ -217,6 +222,7 @@ class neutron::keystone::authtoken(
   $token_cache_time               = $::os_service_default,
   $service_token_roles            = $::os_service_default,
   $service_token_roles_required   = $::os_service_default,
+  $service_type                   = $::os_service_default,
   $interface                      = $::os_service_default,
 ) {
 
@@ -261,6 +267,7 @@ class neutron::keystone::authtoken(
     token_cache_time               => $token_cache_time,
     service_token_roles            => $service_token_roles,
     service_token_roles_required   => $service_token_roles_required,
+    service_type                   => $service_type,
     interface                      => $interface,
   }
 }
diff --git a/releasenotes/notes/keystone-authtoken-service_type-2cdc4de207123029.yaml b/releasenotes/notes/keystone-authtoken-service_type-2cdc4de207123029.yaml
new file mode 100644
index 000000000..bd81d12de
--- /dev/null
+++ b/releasenotes/notes/keystone-authtoken-service_type-2cdc4de207123029.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    The new ``neutron::keystone::authtoken::service_type`` parameter has been
+    added to configure the service_type parameter in authtoken middleware.
diff --git a/spec/classes/neutron_keystone_authtoken_spec.rb b/spec/classes/neutron_keystone_authtoken_spec.rb
index d43423c75..d6c0ecf50 100644
--- a/spec/classes/neutron_keystone_authtoken_spec.rb
+++ b/spec/classes/neutron_keystone_authtoken_spec.rb
@@ -41,6 +41,7 @@ describe 'neutron::keystone::authtoken' do
         should contain_neutron_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>')
         should contain_neutron_config('keystone_authtoken/service_token_roles').with_value('<SERVICE DEFAULT>')
         should contain_neutron_config('keystone_authtoken/service_token_roles_required').with_value('<SERVICE DEFAULT>')
+        should contain_neutron_config('keystone_authtoken/service_type').with_value('<SERVICE DEFAULT>')
         should contain_neutron_config('keystone_authtoken/interface').with_value('<SERVICE DEFAULT>')
       end
     end
@@ -82,6 +83,7 @@ describe 'neutron::keystone::authtoken' do
           :token_cache_time                     => '301',
           :service_token_roles                  => ['service'],
           :service_token_roles_required         => false,
+          :service_type                         => 'identity',
           :interface                            => 'internal',
         })
       end
@@ -120,6 +122,7 @@ describe 'neutron::keystone::authtoken' do
         should contain_neutron_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time])
         should contain_neutron_config('keystone_authtoken/service_token_roles').with_value(params[:service_token_roles])
         should contain_neutron_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required])
+        should contain_neutron_config('keystone_authtoken/service_type').with_value(params[:service_type])
         should contain_neutron_config('keystone_authtoken/interface').with_value(params[:interface])
       end