stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge pull request #671 from enovance/bug/666/emilien

Browse Source 
orchestration: configure keystone_ec2_uri
This commit is contained in:
Yanis Guenane
2014-10-08 13:54:40 -04:00
parent 0b70f2ae7c 8a398186d4
commit 06a0011831
3 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/orchestration.pp
View File

@@ -136,6 +136,7 @@ class cloud::orchestration(
keystone_protocol => $ks_keystone_admin_proto, keystone_protocol => $ks_keystone_admin_proto,
keystone_password => $ks_heat_password, keystone_password => $ks_heat_password,
auth_uri => "${ks_keystone_internal_proto}://${ks_keystone_internal_host}:${ks_keystone_internal_port}/v2.0", 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", sql_connection => "mysql://${encoded_user}:${encoded_password}@${heat_db_host}/heat?charset=utf8",
mysql_module => '2.2', mysql_module => '2.2',
rabbit_hosts => $rabbit_hosts, rabbit_hosts => $rabbit_hosts,

1
spec/classes/cloud_orchestration_api_spec.rb
View File

@@ -65,6 +65,7 @@ describe 'cloud::orchestration::api' do
:keystone_protocol => 'http', :keystone_protocol => 'http',
:keystone_password => 'secrete', :keystone_password => 'secrete',
:auth_uri => 'http://10.0.0.1:5000/v2.0', :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', :sql_connection => 'mysql://heat:secrete@10.0.0.1/heat?charset=utf8',
:log_dir => false :log_dir => false
) )

1
spec/classes/cloud_orchestration_engine_spec.rb
View File

@@ -69,6 +69,7 @@ describe 'cloud::orchestration::engine' do
:keystone_protocol => 'http', :keystone_protocol => 'http',
:keystone_password => 'secrete', :keystone_password => 'secrete',
:auth_uri => 'http://10.0.0.1:5000/v2.0', :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', :sql_connection => 'mysql://heat:secrete@10.0.0.1/heat?charset=utf8',
:log_dir => false :log_dir => false
) )