From 4b644ab357e7206ee2ae186f5557186b4440d698 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Wed, 8 Jul 2020 13:01:39 +0900
Subject: [PATCH] Add support for the interface parameter in authtoken
 middleware

This patch adds support for [keystone_authtoken] interface parameter,
so that operators can define which endpoint should be used by authtoken
middleware.

Change-Id: Ib16d3b1a0f60d6bbc9fec470449977bd4ebaf109
(cherry picked from commit dbe9e4c996758ad25e52cc7687744ae5e0c15f9e)
(cherry picked from commit 0ad93965ae2e6b627f95b1d0fee883380e96e09b)
---
 manifests/api/authtoken.pp                                 | 7 +++++++
 manifests/inspector/authtoken.pp                           | 7 +++++++
 .../keystone-authtoken-interface-b0dd654a86c3f262.yaml     | 6 ++++++
 spec/classes/ironic_api_authtoken_spec.rb                  | 3 +++
 4 files changed, 23 insertions(+)
 create mode 100644 releasenotes/notes/keystone-authtoken-interface-b0dd654a86c3f262.yaml

diff --git a/manifests/api/authtoken.pp b/manifests/api/authtoken.pp
index 557bb4ac..a158ec6f 100644
--- a/manifests/api/authtoken.pp
+++ b/manifests/api/authtoken.pp
@@ -178,6 +178,11 @@
 #   a future release and should be enabled if possible.
 #   Defaults to $::os_service_default.
 #
+# [*interface*]
+#  (Optional) Interface to use for the Identity API endpoint. Valid values are
+#  "public", "internal" or "admin".
+#  Defaults to $::os_service_default.
+#
 class ironic::api::authtoken(
   $username                       = 'ironic',
   $password                       = $::os_service_default,
@@ -213,6 +218,7 @@ class ironic::api::authtoken(
   $token_cache_time               = $::os_service_default,
   $service_token_roles            = $::os_service_default,
   $service_token_roles_required   = $::os_service_default,
+  $interface                      = $::os_service_default,
 ) {
 
   include ::ironic::deps
@@ -256,5 +262,6 @@ class ironic::api::authtoken(
     token_cache_time               => $token_cache_time,
     service_token_roles            => $service_token_roles,
     service_token_roles_required   => $service_token_roles_required,
+    interface                      => $interface,
   }
 }
diff --git a/manifests/inspector/authtoken.pp b/manifests/inspector/authtoken.pp
index 56b019d2..7029767b 100644
--- a/manifests/inspector/authtoken.pp
+++ b/manifests/inspector/authtoken.pp
@@ -177,6 +177,11 @@
 #   true/false
 #   Defaults to $::os_service_default.
 #
+# [*interface*]
+#  (Optional) Interface to use for the Identity API endpoint. Valid values are
+#  "public", "internal" or "admin".
+#  Defaults to $::os_service_default.
+#
 class ironic::inspector::authtoken(
   $username                       = 'ironic',
   $password                       = $::os_service_default,
@@ -212,6 +217,7 @@ class ironic::inspector::authtoken(
   $token_cache_time               = $::os_service_default,
   $service_token_roles            = $::os_service_default,
   $service_token_roles_required   = $::os_service_default,
+  $interface                      = $::os_service_default,
 ) {
 
   include ::ironic::deps
@@ -255,5 +261,6 @@ class ironic::inspector::authtoken(
     token_cache_time               => $token_cache_time,
     service_token_roles            => $service_token_roles,
     service_token_roles_required   => $service_token_roles_required,
+    interface                      => $interface,
   }
 }
diff --git a/releasenotes/notes/keystone-authtoken-interface-b0dd654a86c3f262.yaml b/releasenotes/notes/keystone-authtoken-interface-b0dd654a86c3f262.yaml
new file mode 100644
index 00000000..cdabe660
--- /dev/null
+++ b/releasenotes/notes/keystone-authtoken-interface-b0dd654a86c3f262.yaml
@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    The new ``ironic::keystone::authtoken::interface`` parameter has been
+    added, which can be used to set the interface parameter in authtoken
+    middleware.
diff --git a/spec/classes/ironic_api_authtoken_spec.rb b/spec/classes/ironic_api_authtoken_spec.rb
index e7e1e206..6140b632 100644
--- a/spec/classes/ironic_api_authtoken_spec.rb
+++ b/spec/classes/ironic_api_authtoken_spec.rb
@@ -44,6 +44,7 @@ describe 'ironic::api::authtoken' do
         is_expected.to contain_ironic_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_ironic_config('keystone_authtoken/service_token_roles').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_ironic_config('keystone_authtoken/service_token_roles_required').with_value('<SERVICE DEFAULT>')
+        is_expected.to contain_ironic_config('keystone_authtoken/interface').with_value('<SERVICE DEFAULT>')
       end
     end
 
@@ -84,6 +85,7 @@ describe 'ironic::api::authtoken' do
           :token_cache_time               => '301',
           :service_token_roles            => ['service'],
           :service_token_roles_required   => true,
+          :interface                      => 'internal',
         })
       end
 
@@ -121,6 +123,7 @@ describe 'ironic::api::authtoken' do
         is_expected.to contain_ironic_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time])
         is_expected.to contain_ironic_config('keystone_authtoken/service_token_roles').with_value(params[:service_token_roles])
         is_expected.to contain_ironic_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required])
+        is_expected.to contain_ironic_config('keystone_authtoken/interface').with_value(params[:interface])
       end
 
       it 'installs python memcache package' do