openstack
/
fuel-library
Code Issues Proposed changes

Ensure that keystone has admin token enabled 

* Ensure that admin_token_auth filter is enabled
  in the paste file before working with keystone
  Puppet types.

Change-Id: I2baad2f6f775f3aa9c6c9624ec53f08fed479fb1
Closes-Bug: 1596622
This commit is contained in:
Dmitry Ilyin 2016-06-27 20:17:39 +03:00
parent 945c026e50
commit b479998008
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
deployment/puppet/fuel/manifests/keystone.pp
View File

@ -44,6 +44,24 @@ class fuel::keystone (
service_name => $::fuel::params::keystone_service_name,
}
# Ensure that keystone_paste_ini file includes "admin_token_auth" filter
# so the Puppet keystone types are able to use the admin token.
# It will be removed by the next task.
#FIXME(dilyin): This should be rewritten using ini_subsettings
# or some other way
$keystone_paste_ini = '/etc/keystone/keystone-paste.ini'
exec { 'add_admin_token_auth_middleware':
path => ['/bin', '/usr/bin'],
command => "sed -i 's/\\( token_auth \\)/\\1admin_token_auth /' ${keystone_paste_ini}",
unless => "fgrep -q ' admin_token_auth' ${keystone_paste_ini}",
require => Package['keystone'],
}
Exec['add_admin_token_auth_middleware'] ->
Exec <| title == 'keystone-manage db_sync' |> ->
# FIXME(kozhukalov): Remove this hack and use enable_bootstrap instead
# once patch is merged and test envs are updated with the ISO
# that contains Mitaka keystone rpm package.