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: I380868884abe92b35e93c3bf22d877838d0eac55
(cherry picked from commit 0b973b4648)
(cherry picked from commit a15022400a)

manifests/api/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 glance::api::authtoken(
   $username                       = 'glance',
   $password                       = $::os_service_default,
@@ -212,6 +217,7 @@ class glance::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 ::glance::deps
@@ -255,5 +261,6 @@ class glance::api::authtoken(
       token_cache_time               => $token_cache_time,
       service_token_roles            => $service_token_roles,
       service_token_roles_required   => $service_token_roles_required,
+      interface                      => $interface,
     }
 }

manifests/registry/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 glance::registry::authtoken(
   $username                       = 'glance',
   $password                       = $::os_service_default,
@@ -212,6 +217,7 @@ class glance::registry::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 ::glance::deps
@@ -255,5 +261,6 @@ class glance::registry::authtoken(
       token_cache_time               => $token_cache_time,
       service_token_roles            => $service_token_roles,
       service_token_roles_required   => $service_token_roles_required,
+      interface                      => $interface,
     }
 }

releasenotes/notes/keystone-authtoken-interface-f8d92000874248fd.yaml

@@ -0,0 +1,8 @@
+---
+features:
+  - |
+    The following new parameters have been added, which can be used to set
+    the interface parameter in authtoken middleware.
+
+    - ``glance::api::authtoken::interface``
+    - ``glance::registry::authtoken::interface``

spec/classes/glance_api_authtoken_spec.rb

@@ -44,6 +44,7 @@ describe 'glance::api::authtoken' do
         is_expected.to contain_glance_api_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_glance_api_config('keystone_authtoken/service_token_roles').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_glance_api_config('keystone_authtoken/service_token_roles_required').with_value('<SERVICE DEFAULT>')
+        is_expected.to contain_glance_api_config('keystone_authtoken/interface').with_value('<SERVICE DEFAULT>')
       end
     end
 
@@ -84,6 +85,7 @@ describe 'glance::api::authtoken' do
           :token_cache_time                     => '301',
           :service_token_roles                  => ['service'],
           :service_token_roles_required         => false,
+          :interface                            => 'internal',
         })
       end
 
@@ -121,6 +123,7 @@ describe 'glance::api::authtoken' do
         is_expected.to contain_glance_api_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time])
         is_expected.to contain_glance_api_config('keystone_authtoken/service_token_roles').with_value(params[:service_token_roles])
         is_expected.to contain_glance_api_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required])
+        is_expected.to contain_glance_api_config('keystone_authtoken/interface').with_value(params[:interface])
       end
 
       it 'installs python memcache package' do

spec/classes/glance_registry_authtoken_spec.rb

@@ -44,6 +44,7 @@ describe 'glance::registry::authtoken' do
         is_expected.to contain_glance_registry_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_glance_registry_config('keystone_authtoken/service_token_roles').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_glance_registry_config('keystone_authtoken/service_token_roles_required').with_value('<SERVICE DEFAULT>')
+        is_expected.to contain_glance_registry_config('keystone_authtoken/interface').with_value('<SERVICE DEFAULT>')
       end
     end
 
@@ -84,6 +85,7 @@ describe 'glance::registry::authtoken' do
           :token_cache_time                     => '301',
           :service_token_roles                  => ['service'],
           :service_token_roles_required         => false,
+          :interface                            => 'internal',
         })
       end
 
@@ -121,6 +123,7 @@ describe 'glance::registry::authtoken' do
         is_expected.to contain_glance_registry_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time])
         is_expected.to contain_glance_registry_config('keystone_authtoken/service_token_roles').with_value(params[:service_token_roles])
         is_expected.to contain_glance_registry_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required])
+        is_expected.to contain_glance_registry_config('keystone_authtoken/interface').with_value(params[:interface])
       end
 
       it 'installs python memcache package' do