openstack
/
fuel-library
Code Issues Proposed changes

Merge "Use correct password for keystone bootstrap"

This commit is contained in:
Jenkins 2016-10-06 11:04:12 +00:00 committed by Gerrit Code Review
parent 62155b409f efb02d6bf2
commit 24707c3211
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,6 +51,7 @@ class fuel::keystone (
# be updated and 'keystone-manage bootstrap' command will be available
enable_bootstrap => false,
admin_token => $admin_token,
admin_password => $admin_password,
catalog_type => 'sql',
database_connection => "${db_engine}://${db_user}:${db_password}@${db_host}:${db_port}/${db_name}",
token_expiration => $token_expiration,

1
deployment/puppet/openstack_tasks/manifests/keystone/keystone.pp
View File

@ -302,6 +302,7 @@ class openstack_tasks::keystone::keystone {
debug => $debug,
catalog_type => 'sql',
admin_token => $admin_token,
admin_password => $admin_password,
enabled => false,
database_connection => $db_connection,
database_max_retries => $max_retries,

8
tests/noop/spec/hosts/keystone/keystone_spec.rb
View File

@ -30,7 +30,8 @@ describe manifest do
configuration_override.fetch('keystone_config', {})
end
admin_token = Noop.hiera_structure 'keystone/admin_token'
let(:admin_token) { Noop.hiera_structure 'keystone/admin_token' }
let(:admin_password) { Noop.hiera_structure 'access/password' }
public_vip = Noop.hiera('public_vip')
management_vip= Noop.hiera('management_vip')
public_ssl_hash = Noop.hiera_hash('public_ssl')
@ -116,9 +117,10 @@ describe manifest do
)
end
it 'should declare keystone class with admin_token' do
it 'should declare keystone class with admin_token and admin_password' do
should contain_class('keystone').with(
'admin_token' => admin_token
'admin_token' => admin_token,
'admin_password' => admin_password
)
end