Do not run keystone bootstrap command
Our MOS packages are outdated, so 'keystone-manage bootstrap' command aren't available and can't be run. Revert this patch after MOS packages update. Closes-bug: #1551584 Change-Id: I961e3782c95096321cfc4b09fc2e5f899f265551
This commit is contained in:
parent
7ddfaed080
commit
4a63d8c43d
|
@ -30,6 +30,9 @@ class fuel::keystone (
|
||||||
'python-unicodecsv', 'rubygem-thread_safe'])
|
'python-unicodecsv', 'rubygem-thread_safe'])
|
||||||
|
|
||||||
class { '::keystone':
|
class { '::keystone':
|
||||||
|
# (TODO iberezovskiy): Set 'enable_bootstrap' to true when MOS packages will
|
||||||
|
# be updated and 'keystone-manage bootstrap' command will be available
|
||||||
|
enable_bootstrap => false,
|
||||||
admin_token => $admin_token,
|
admin_token => $admin_token,
|
||||||
catalog_type => 'sql',
|
catalog_type => 'sql',
|
||||||
database_connection => "${db_engine}://${db_user}:${db_password}@${db_host}:${db_port}/${db_name}",
|
database_connection => "${db_engine}://${db_user}:${db_password}@${db_host}:${db_port}/${db_name}",
|
||||||
|
|
|
@ -118,6 +118,9 @@ class openstack::keystone (
|
||||||
|
|
||||||
if $enabled {
|
if $enabled {
|
||||||
class { '::keystone':
|
class { '::keystone':
|
||||||
|
# (TODO iberezovskiy): Set 'enable_bootstrap' to true when MOS packages will
|
||||||
|
# be updated and 'keystone-manage bootstrap' command will be available
|
||||||
|
enable_bootstrap => false,
|
||||||
verbose => $verbose,
|
verbose => $verbose,
|
||||||
debug => $debug,
|
debug => $debug,
|
||||||
catalog_type => 'sql',
|
catalog_type => 'sql',
|
||||||
|
|
|
@ -108,6 +108,11 @@ describe manifest do
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# (TODO iberezovskiy):Remove this after MOS Packages will be updated
|
||||||
|
it 'should disable keystone bootstrap' do
|
||||||
|
should contain_class('keystone').with('enable_bootstrap' => false)
|
||||||
|
end
|
||||||
|
|
||||||
it 'should declare openstack::keystone class with public_url,admin_url,internal_url' do
|
it 'should declare openstack::keystone class with public_url,admin_url,internal_url' do
|
||||||
should contain_class('openstack::keystone').with(
|
should contain_class('openstack::keystone').with(
|
||||||
'public_url' => public_url,
|
'public_url' => public_url,
|
||||||
|
|
Loading…
Reference in New Issue