openstack/cookbook-openstack-orchestration
Code Issues Proposed changes

Update centos/redhat/rdo package names

Browse Source 
Update the package names

Change-Id: Ica917bce1932bca9b88b02c5af4bddc6e746acde
Closes-Bug: #1483812
This commit is contained in:
Mark Vanderwiel 2015-08-11 11:39:49 -05:00
parent 0170665c67
commit 2ae14f7965
6 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
attributes/default.rb
View File

@ -206,15 +206,15 @@ when 'fedora', 'rhel' # :pragma-foodcritic: ~FC024 - won't fix this
default['openstack']['orchestration']['user'] = 'heat'
default['openstack']['orchestration']['group'] = 'heat'
default['openstack']['orchestration']['platform'] = {
'heat_common_packages' => ['openstack-heat'],
'heat_common_packages' => ['openstack-heat-common'],
'heat_client_packages' => ['python-heatclient'],
'heat_api_packages' => ['python-heatclient'],
'heat_api_packages' => ['openstack-heat-api', 'python-heatclient'],
'heat_api_service' => 'openstack-heat-api',
'heat_api_cfn_packages' => ['python-heatclient'],
'heat_api_cfn_packages' => ['openstack-heat-api-cfn', 'python-heatclient'],
'heat_api_cfn_service' => 'openstack-heat-api-cfn',
'heat_api_cloudwatch_packages' => ['python-heatclient'],
'heat_api_cloudwatch_packages' => ['openstack-heat-api-cloudwatch', 'python-heatclient'],
'heat_api_cloudwatch_service' => 'openstack-heat-api-cloudwatch',
'heat_engine_packages' => [],
'heat_engine_packages' => ['openstack-heat-engine'],
'heat_engine_service' => 'openstack-heat-engine',
'heat_api_process_name' => 'heat-api',
'package_overrides' => ''

6
spec/api-cfn-redhat_spec.rb
View File

@ -10,8 +10,10 @@ describe 'openstack-orchestration::api-cfn' do
include_context 'orchestration_stubs'
include_examples 'expect runs openstack orchestration common recipe'
it 'installs heat client packages' do
expect(chef_run).to upgrade_package 'python-heatclient'
it 'installs heat cfn packages' do
['openstack-heat-api-cfn', 'python-heatclient'].each do |pkg|
expect(chef_run).to upgrade_package pkg
end
end
it 'starts heat api-cfn on boot' do

6
spec/api-cloudwatch-redhat_spec.rb
View File

@ -10,8 +10,10 @@ describe 'openstack-orchestration::api-cloudwatch' do
include_context 'orchestration_stubs'
include_examples 'expect runs openstack orchestration common recipe'
it 'installs heat client packages' do
expect(chef_run).to upgrade_package 'python-heatclient'
it 'installs heat cloudwatch packages' do
['openstack-heat-api-cloudwatch', 'python-heatclient'].each do |pkg|
expect(chef_run).to upgrade_package pkg
end
end
it 'starts heat api-cloudwatch on boot' do

6
spec/api-redhat_spec.rb
View File

@ -10,8 +10,10 @@ describe 'openstack-orchestration::api' do
include_context 'orchestration_stubs'
include_examples 'expect runs openstack orchestration common recipe'
it 'installs heat client packages' do
expect(chef_run).to upgrade_package 'python-heatclient'
it 'installs heat api packages' do
['openstack-heat-api', 'python-heatclient'].each do |pkg|
expect(chef_run).to upgrade_package pkg
end
end
it 'starts heat api on boot' do

4
spec/engine-redhat_spec.rb
View File

@ -10,6 +10,10 @@ describe 'openstack-orchestration::engine' do
include_context 'orchestration_stubs'
include_examples 'expect runs openstack orchestration common recipe'
it 'installs heat engine package' do
expect(chef_run).to upgrade_package 'openstack-heat-engine'
end
it 'starts heat engine on boot' do
expect(chef_run).to enable_service('openstack-heat-engine')
end

4
spec/spec_helper.rb
View File

@ -81,8 +81,8 @@ shared_examples 'expect runs openstack common logging recipe' do
end
shared_examples 'expect installs common heat package' do
it 'installs the openstack-heat package' do
expect(chef_run).to upgrade_package 'openstack-heat'
it 'installs the openstack-heat common package' do
expect(chef_run).to upgrade_package 'openstack-heat-common'
end
end