From 1f2f36aac5cc0cd4570d7a4c3578eeaaff51af7e Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Wed, 12 Nov 2014 12:35:19 +0100 Subject: [PATCH] orchestration: switch deferred_auth_method to 'password' 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. --- manifests/orchestration/engine.pp | 7 ++++++- spec/classes/cloud_orchestration_engine_spec.rb | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/manifests/orchestration/engine.pp b/manifests/orchestration/engine.pp index 88713c72..3af899dc 100644 --- a/manifests/orchestration/engine.pp +++ b/manifests/orchestration/engine.pp @@ -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', } } diff --git a/spec/classes/cloud_orchestration_engine_spec.rb b/spec/classes/cloud_orchestration_engine_spec.rb index a1950675..a33084bf 100644 --- a/spec/classes/cloud_orchestration_engine_spec.rb +++ b/spec/classes/cloud_orchestration_engine_spec.rb @@ -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