From 8a398186d4d5c4160a6ac95b5312d56fd7ae89e9 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Wed, 8 Oct 2014 12:02:28 -0400 Subject: [PATCH] orchestration: configure keystone_ec2_uri Configure keystone_ec2_uri in heat.conf with the same parameter as auth_uri. Close #666 --- manifests/orchestration.pp | 1 + spec/classes/cloud_orchestration_api_spec.rb | 1 + spec/classes/cloud_orchestration_engine_spec.rb | 1 + 3 files changed, 3 insertions(+) diff --git a/manifests/orchestration.pp b/manifests/orchestration.pp index b3ea8236..9c7f63cc 100644 --- a/manifests/orchestration.pp +++ b/manifests/orchestration.pp @@ -136,6 +136,7 @@ class cloud::orchestration( keystone_protocol => $ks_keystone_admin_proto, keystone_password => $ks_heat_password, auth_uri => "${ks_keystone_internal_proto}://${ks_keystone_internal_host}:${ks_keystone_internal_port}/v2.0", + keystone_ec2_uri => "${ks_keystone_internal_proto}://${ks_keystone_internal_host}:${ks_keystone_internal_port}/v2.0/ec2tokens", sql_connection => "mysql://${encoded_user}:${encoded_password}@${heat_db_host}/heat?charset=utf8", mysql_module => '2.2', rabbit_hosts => $rabbit_hosts, diff --git a/spec/classes/cloud_orchestration_api_spec.rb b/spec/classes/cloud_orchestration_api_spec.rb index 0f8962b7..a7f08d14 100644 --- a/spec/classes/cloud_orchestration_api_spec.rb +++ b/spec/classes/cloud_orchestration_api_spec.rb @@ -65,6 +65,7 @@ describe 'cloud::orchestration::api' do :keystone_protocol => 'http', :keystone_password => 'secrete', :auth_uri => 'http://10.0.0.1:5000/v2.0', + :keystone_ec2_uri => 'http://10.0.0.1:5000/v2.0/ec2tokens', :sql_connection => 'mysql://heat:secrete@10.0.0.1/heat?charset=utf8', :log_dir => false ) diff --git a/spec/classes/cloud_orchestration_engine_spec.rb b/spec/classes/cloud_orchestration_engine_spec.rb index 46d10166..a1950675 100644 --- a/spec/classes/cloud_orchestration_engine_spec.rb +++ b/spec/classes/cloud_orchestration_engine_spec.rb @@ -69,6 +69,7 @@ describe 'cloud::orchestration::engine' do :keystone_protocol => 'http', :keystone_password => 'secrete', :auth_uri => 'http://10.0.0.1:5000/v2.0', + :keystone_ec2_uri => 'http://10.0.0.1:5000/v2.0/ec2tokens', :sql_connection => 'mysql://heat:secrete@10.0.0.1/heat?charset=utf8', :log_dir => false )