Browse Source

Merge "Deprecated python-heatclient"

Jenkins 2 years ago
parent
commit
5943b3b5b3

+ 6
- 8
attributes/default.rb View File

@@ -69,12 +69,11 @@ when 'rhel'
69 69
   default['openstack']['orchestration']['group'] = 'heat'
70 70
   default['openstack']['orchestration']['platform'] = {
71 71
     'heat_common_packages' => ['openstack-heat-common'],
72
-    'heat_client_packages' => ['python-heatclient'],
73
-    'heat_api_packages' => ['openstack-heat-api', 'python-heatclient'],
72
+    'heat_api_packages' => ['openstack-heat-api'],
74 73
     'heat_api_service' => 'openstack-heat-api',
75
-    'heat_api_cfn_packages' => ['openstack-heat-api-cfn', 'python-heatclient'],
74
+    'heat_api_cfn_packages' => ['openstack-heat-api-cfn'],
76 75
     'heat_api_cfn_service' => 'openstack-heat-api-cfn',
77
-    'heat_api_cloudwatch_packages' => ['openstack-heat-api-cloudwatch', 'python-heatclient'],
76
+    'heat_api_cloudwatch_packages' => ['openstack-heat-api-cloudwatch'],
78 77
     'heat_api_cloudwatch_service' => 'openstack-heat-api-cloudwatch',
79 78
     'heat_engine_packages' => ['openstack-heat-engine'],
80 79
     'heat_engine_service' => 'openstack-heat-engine',
@@ -86,12 +85,11 @@ when 'debian'
86 85
   default['openstack']['orchestration']['group'] = 'heat'
87 86
   default['openstack']['orchestration']['platform'] = {
88 87
     'heat_common_packages' => ['heat-common'],
89
-    'heat_client_packages' => ['python-heatclient'],
90
-    'heat_api_packages' => ['heat-api', 'python-heatclient'],
88
+    'heat_api_packages' => ['heat-api'],
91 89
     'heat_api_service' => 'heat-api',
92
-    'heat_api_cfn_packages' => ['heat-api-cfn', 'python-heatclient'],
90
+    'heat_api_cfn_packages' => ['heat-api-cfn'],
93 91
     'heat_api_cfn_service' => 'heat-api-cfn',
94
-    'heat_api_cloudwatch_packages' => ['heat-api-cloudwatch', 'python-heatclient'],
92
+    'heat_api_cloudwatch_packages' => ['heat-api-cloudwatch'],
95 93
     'heat_api_cloudwatch_service' => 'heat-api-cloudwatch',
96 94
     'heat_engine_packages' => ['heat-engine'],
97 95
     'heat_engine_service' => 'heat-engine',

+ 0
- 32
recipes/client.rb View File

@@ -1,32 +0,0 @@
1
-# encoding: UTF-8
2
-#
3
-# Cookbook Name:: openstack-orchestration
4
-# Recipe:: client
5
-#
6
-# Copyright 2014, IBM Corp.
7
-#
8
-# Licensed under the Apache License, Version 2.0 (the "License");
9
-# you may not use this file except in compliance with the License.
10
-# You may obtain a copy of the License at
11
-#
12
-#     http://www.apache.org/licenses/LICENSE-2.0
13
-#
14
-# Unless required by applicable law or agreed to in writing, software
15
-# distributed under the License is distributed on an "AS IS" BASIS,
16
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17
-# See the License for the specific language governing permissions and
18
-# limitations under the License.
19
-#
20
-
21
-class ::Chef::Recipe # rubocop:disable Documentation
22
-  include ::Openstack
23
-end
24
-
25
-platform_options = node['openstack']['orchestration']['platform']
26
-platform_options['heat_client_packages'].each do |pkg|
27
-  package pkg do
28
-    options platform_options['package_overrides']
29
-
30
-    action :upgrade
31
-  end
32
-end

+ 0
- 5
recipes/common.rb View File

@@ -29,11 +29,6 @@ end
29 29
 
30 30
 platform_options = node['openstack']['orchestration']['platform']
31 31
 
32
-package 'python-keystoneclient' do
33
-  options platform_options['package_overrides']
34
-  action :upgrade
35
-end
36
-
37 32
 platform_options['heat_common_packages'].each do |pkg|
38 33
   package pkg do
39 34
     options platform_options['package_overrides']

+ 1
- 3
spec/api-cfn-redhat_spec.rb View File

@@ -11,9 +11,7 @@ describe 'openstack-orchestration::api-cfn' do
11 11
     include_examples 'expect runs openstack orchestration common recipe'
12 12
 
13 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
14
+      expect(chef_run).to upgrade_package 'openstack-heat-api-cfn'
17 15
     end
18 16
 
19 17
     it 'starts heat api-cfn on boot' do

+ 1
- 3
spec/api-cloudwatch-redhat_spec.rb View File

@@ -11,9 +11,7 @@ describe 'openstack-orchestration::api-cloudwatch' do
11 11
     include_examples 'expect runs openstack orchestration common recipe'
12 12
 
13 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
14
+      expect(chef_run).to upgrade_package 'openstack-heat-api-cloudwatch'
17 15
     end
18 16
 
19 17
     it 'starts heat api-cloudwatch on boot' do

+ 1
- 3
spec/api-redhat_spec.rb View File

@@ -11,9 +11,7 @@ describe 'openstack-orchestration::api' do
11 11
     include_examples 'expect runs openstack orchestration common recipe'
12 12
 
13 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
14
+      expect(chef_run).to upgrade_package 'openstack-heat-api'
17 15
     end
18 16
 
19 17
     it 'starts heat api on boot' do

+ 0
- 13
spec/client-redhat_spec.rb View File

@@ -1,13 +0,0 @@
1
-# encoding: UTF-8
2
-require_relative 'spec_helper'
3
-
4
-describe 'openstack-orchestration::client' do
5
-  describe 'redhat' do
6
-    let(:runner) { ChefSpec::SoloRunner.new(REDHAT_OPTS) }
7
-    let(:chef_run) { runner.converge(described_recipe) }
8
-
9
-    it 'installs packages' do
10
-      expect(chef_run).to upgrade_package('python-heatclient')
11
-    end
12
-  end
13
-end

+ 0
- 13
spec/client_spec.rb View File

@@ -1,13 +0,0 @@
1
-# encoding: UTF-8
2
-require_relative 'spec_helper'
3
-
4
-describe 'openstack-orchestration::client' do
5
-  describe 'ubuntu' do
6
-    let(:runner) { ChefSpec::SoloRunner.new(UBUNTU_OPTS) }
7
-    let(:chef_run) { runner.converge(described_recipe) }
8
-
9
-    it 'installs packages' do
10
-      expect(chef_run).to upgrade_package('python-heatclient')
11
-    end
12
-  end
13
-end

+ 0
- 1
spec/common-redhat_spec.rb View File

@@ -9,7 +9,6 @@ describe 'openstack-orchestration::common' do
9 9
 
10 10
     include_context 'orchestration_stubs'
11 11
     include_examples 'logging'
12
-    include_examples 'expect installs python keystoneclient'
13 12
     include_examples 'expects to create heat directories'
14 13
     include_examples 'expects to create heat conf'
15 14
     include_examples 'expects to create heat default.yaml'

+ 0
- 1
spec/common_spec.rb View File

@@ -9,7 +9,6 @@ describe 'openstack-orchestration::common' do
9 9
 
10 10
     include_context 'orchestration_stubs'
11 11
     include_examples 'logging'
12
-    include_examples 'expect installs python keystoneclient'
13 12
     include_examples 'expects to create heat directories'
14 13
     include_examples 'expects to create heat conf'
15 14
     include_examples 'expects to create heat default.yaml'

+ 1
- 7
spec/spec_helper.rb View File

@@ -14,7 +14,7 @@ REDHAT_OPTS = {
14 14
 }.freeze
15 15
 UBUNTU_OPTS = {
16 16
   platform: 'ubuntu',
17
-  version: '14.04',
17
+  version: '16.04',
18 18
   log_level: ::LOG_LEVEL
19 19
 }.freeze
20 20
 SUSE_OPTS = {
@@ -62,12 +62,6 @@ shared_examples 'expect runs openstack orchestration common recipe' do
62 62
   end
63 63
 end
64 64
 
65
-shared_examples 'expect installs python keystoneclient' do
66
-  it 'installs python-keystoneclient' do
67
-    expect(chef_run).to upgrade_package 'python-keystoneclient'
68
-  end
69
-end
70
-
71 65
 shared_examples 'expect runs openstack common logging recipe' do
72 66
   it 'runs logging recipe if node attributes say to' do
73 67
     expect(chef_run).to include_recipe 'openstack-common::logging'

Loading…
Cancel
Save