stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Revert "heat: ensure admin has heat_stack_owner role"

Browse Source 
This reverts commit a6416cc985.
This commit is contained in:
Yanis Guenane
2014-10-31 16:08:28 -04:00
parent ee241b2194
commit 9838aa5f04
2 changed files with 23 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/orchestration/engine.pp
View File

@@ -23,8 +23,7 @@ class cloud::orchestration::engine(
$ks_heat_password = 'heatpassword', $ks_heat_password = 'heatpassword',
$ks_heat_cfn_public_port = 8000, $ks_heat_cfn_public_port = 8000,
$ks_heat_cloudwatch_public_port = 8003, $ks_heat_cloudwatch_public_port = 8003,
$auth_encryption_key = 'secrete', $auth_encryption_key = 'secrete'
$ks_admin_tenant = 'admin',
) { ) {
include 'cloud::orchestration' include 'cloud::orchestration'
@@ -37,10 +36,4 @@ class cloud::orchestration::engine(
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}"
} }
# to avoid bug https://bugs.launchpad.net/heat/+bug/1306665
keystone_user_role { "admin@${ks_admin_tenant}":
ensure => present,
roles => 'heat_stack_owner',
}
} }

4
spec/classes/cloud_orchestration_engine_spec.rb
View File

@@ -84,10 +84,6 @@ describe 'cloud::orchestration::engine' do
:heat_waitcondition_server_url => 'http://10.0.0.1:8000/v1/waitcondition', :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'
) )
is_expected.to contain_keystone_user_role('admin@admin').with(
:ensure => 'present',
:roles => 'heat_stack_owner',
)
end end
end end