Browse Source

Merge "Update centos/redhat/rdo package names"

tags/kilo-eol
Jenkins 3 years ago
parent
commit
411d553f94

+ 5
- 5
attributes/default.rb View File

@@ -206,15 +206,15 @@ when 'fedora', 'rhel' # :pragma-foodcritic: ~FC024 - won't fix this
206 206
   default['openstack']['orchestration']['user'] = 'heat'
207 207
   default['openstack']['orchestration']['group'] = 'heat'
208 208
   default['openstack']['orchestration']['platform'] = {
209
-    'heat_common_packages' => ['openstack-heat'],
209
+    'heat_common_packages' => ['openstack-heat-common'],
210 210
     'heat_client_packages' => ['python-heatclient'],
211
-    'heat_api_packages' => ['python-heatclient'],
211
+    'heat_api_packages' => ['openstack-heat-api', 'python-heatclient'],
212 212
     'heat_api_service' => 'openstack-heat-api',
213
-    'heat_api_cfn_packages' => ['python-heatclient'],
213
+    'heat_api_cfn_packages' => ['openstack-heat-api-cfn', 'python-heatclient'],
214 214
     'heat_api_cfn_service' => 'openstack-heat-api-cfn',
215
-    'heat_api_cloudwatch_packages' => ['python-heatclient'],
215
+    'heat_api_cloudwatch_packages' => ['openstack-heat-api-cloudwatch', 'python-heatclient'],
216 216
     'heat_api_cloudwatch_service' => 'openstack-heat-api-cloudwatch',
217
-    'heat_engine_packages' => [],
217
+    'heat_engine_packages' => ['openstack-heat-engine'],
218 218
     'heat_engine_service' => 'openstack-heat-engine',
219 219
     'heat_api_process_name' => 'heat-api',
220 220
     'package_overrides' => ''

+ 4
- 2
spec/api-cfn-redhat_spec.rb View File

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

+ 4
- 2
spec/api-cloudwatch-redhat_spec.rb View File

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

+ 4
- 2
spec/api-redhat_spec.rb View File

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

+ 4
- 0
spec/engine-redhat_spec.rb View File

@@ -10,6 +10,10 @@ describe 'openstack-orchestration::engine' do
10 10
     include_context 'orchestration_stubs'
11 11
     include_examples 'expect runs openstack orchestration common recipe'
12 12
 
13
+    it 'installs heat engine package' do
14
+      expect(chef_run).to upgrade_package 'openstack-heat-engine'
15
+    end
16
+
13 17
     it 'starts heat engine on boot' do
14 18
       expect(chef_run).to enable_service('openstack-heat-engine')
15 19
     end

+ 2
- 2
spec/spec_helper.rb View File

@@ -81,8 +81,8 @@ shared_examples 'expect runs openstack common logging recipe' do
81 81
 end
82 82
 
83 83
 shared_examples 'expect installs common heat package' do
84
-  it 'installs the openstack-heat package' do
85
-    expect(chef_run).to upgrade_package 'openstack-heat'
84
+  it 'installs the openstack-heat common package' do
85
+    expect(chef_run).to upgrade_package 'openstack-heat-common'
86 86
   end
87 87
 end
88 88
 

Loading…
Cancel
Save