stackforge/puppet-openstack-cloud
Code Issues Proposed changes

orchestration: switch deferred_auth_method to 'password'

Browse Source 
Before, 'trusts' was set by default but it requires Keystone API v3.
Since we are still working on Icehouse, let's use 'password' which
supports Keystone API v2.
This commit is contained in:
Emilien Macchi 2014-11-12 12:35:19 +01:00
parent 3669030752
commit 1f2f36aac5
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/orchestration/engine.pp
View File

@ -33,7 +33,12 @@ class cloud::orchestration::engine(
auth_encryption_key => $auth_encryption_key,
heat_metadata_server_url => "${ks_heat_public_proto}://${ks_heat_public_host}:${ks_heat_cfn_public_port}",
heat_waitcondition_server_url => "${ks_heat_public_proto}://${ks_heat_public_host}:${ks_heat_cfn_public_port}/v1/waitcondition",
heat_watch_server_url => "${ks_heat_public_proto}://${ks_heat_public_host}:${ks_heat_cloudwatch_public_port}"
heat_watch_server_url => "${ks_heat_public_proto}://${ks_heat_public_host}:${ks_heat_cloudwatch_public_port}",
# TODO (EmilienM): Need to be updated in Juno
# The default deferred_auth_method of password is deprecated as of Icehouse, so although it is still the default, deployers are
# strongly encouraged to move to using deferred_auth_method=trusts, which is planned to become the default for Juno.
# 'trusts' requires Keystone API v3 enabled, otherwise we have to use 'password'.
deferred_auth_method => 'password',
}
}

3
spec/classes/cloud_orchestration_engine_spec.rb
View File

@ -82,7 +82,8 @@ describe 'cloud::orchestration::engine' do
:auth_encryption_key => 'secrete',
:heat_metadata_server_url => 'http://10.0.0.1:8000',
:heat_waitcondition_server_url => 'http://10.0.0.1:8000/v1/waitcondition',
:heat_watch_server_url => 'http://10.0.0.1:8003'
:heat_watch_server_url => 'http://10.0.0.1:8003',
:deferred_auth_method => 'password',
)
end