Browse Source

Merge "Deprecated python-novaclient"

Jenkins 2 years ago
parent
commit
0aebc9986a

+ 0
- 4
attributes/default.rb View File

@@ -132,11 +132,9 @@ when 'rhel' # :pragma-foodcritic: ~FC024 - won't fix this
132 132
   default['openstack']['compute']['platform'] = {
133 133
     'api_os_compute_packages' => ['openstack-nova-api'],
134 134
     'api_os_compute_service' => 'openstack-nova-api',
135
-    'neutron_python_packages' => ['python-neutronclient', 'pyparsing'],
136 135
     'memcache_python_packages' => ['python-memcached'],
137 136
     'compute_api_metadata_packages' => ['openstack-nova-api'],
138 137
     'compute_api_metadata_service' => 'openstack-nova-metadata-api',
139
-    'compute_client_packages' => ['python-novaclient'],
140 138
     'compute_compute_packages' => ['openstack-nova-compute'],
141 139
     'qemu_compute_packages' => [],
142 140
     'kvm_compute_packages' => [],
@@ -169,10 +167,8 @@ when 'debian'
169 167
     'api_os_compute_packages' => ['nova-api-os-compute'],
170 168
     'api_os_compute_service' => 'nova-api-os-compute',
171 169
     'memcache_python_packages' => ['python-memcache'],
172
-    'neutron_python_packages' => ['python-neutronclient', 'python-pyparsing'],
173 170
     'compute_api_metadata_packages' => ['nova-api-metadata'],
174 171
     'compute_api_metadata_service' => 'nova-api-metadata',
175
-    'compute_client_packages' => ['python-novaclient'],
176 172
     'compute_compute_packages' => ['nova-compute'],
177 173
     'qemu_compute_packages' => ['nova-compute-qemu'],
178 174
     'kvm_compute_packages' => ['nova-compute-kvm'],

+ 0
- 5
recipes/api-metadata.rb View File

@@ -29,11 +29,6 @@ include_recipe 'openstack-compute::nova-common'
29 29
 
30 30
 platform_options = node['openstack']['compute']['platform']
31 31
 
32
-# NOTE(mrodden): required for keystone auth middleware
33
-package 'python-keystoneclient' do
34
-  action :upgrade
35
-end
36
-
37 32
 platform_options['compute_api_metadata_packages'].each do |pkg|
38 33
   package pkg do
39 34
     options platform_options['package_overrides']

+ 0
- 5
recipes/api-os-compute.rb View File

@@ -32,11 +32,6 @@ directory ::File.dirname(node['openstack']['compute']['conf']['keystone_authtoke
32 32
   mode 00700
33 33
 end
34 34
 
35
-# NOTE(mrodden): required for keystone auth middleware
36
-package 'python-keystoneclient' do
37
-  action :upgrade
38
-end
39
-
40 35
 platform_options['api_os_compute_packages'].each do |pkg|
41 36
   package pkg do
42 37
     options platform_options['package_overrides']

+ 0
- 31
recipes/client.rb View File

@@ -1,31 +0,0 @@
1
-# encoding: UTF-8
2
-#
3
-# Cookbook Name:: openstack-compute
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
22
-  include ::Openstack
23
-end
24
-
25
-platform_options = node['openstack']['compute']['platform']
26
-platform_options['compute_client_packages'].each do |pkg|
27
-  package pkg do
28
-    options platform_options['package_overrides']
29
-    action :upgrade
30
-  end
31
-end

+ 0
- 1
spec/api-metadata_spec.rb View File

@@ -12,7 +12,6 @@ describe 'openstack-compute::api-metadata' do
12 12
     include_examples 'expect_runs_nova_common_recipe'
13 13
     include_examples 'expect_creates_nova_state_dir'
14 14
     include_examples 'expect_creates_nova_lock_dir'
15
-    include_examples 'expect_upgrades_python_keystoneclient'
16 15
     include_examples 'expect_creates_api_paste_template'
17 16
 
18 17
     it 'upgrades metadata api packages' do

+ 0
- 1
spec/api-os-compute_spec.rb View File

@@ -12,7 +12,6 @@ describe 'openstack-compute::api-os-compute' do
12 12
     include_examples 'expect_runs_nova_common_recipe'
13 13
     include_examples 'expect_creates_nova_state_dir'
14 14
     include_examples 'expect_creates_nova_lock_dir'
15
-    include_examples 'expect_upgrades_python_keystoneclient'
16 15
     include_examples 'expect_creates_api_paste_template'
17 16
 
18 17
     it 'creates the /var/cache/nova directory' do

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

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

+ 0
- 16
spec/client_spec.rb View File

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

+ 0
- 6
spec/spec_helper.rb View File

@@ -105,12 +105,6 @@ shared_examples 'expect_runs_nova_common_recipe' do
105 105
   end
106 106
 end
107 107
 
108
-shared_examples 'expect_upgrades_python_keystoneclient' do
109
-  it 'upgrades python-keystoneclient' do
110
-    expect(chef_run).to upgrade_package 'python-keystoneclient'
111
-  end
112
-end
113
-
114 108
 shared_examples 'expect_creates_nova_state_dir' do
115 109
   it 'creates the /var/lib/nova/lock directory' do
116 110
     expect(chef_run).to create_directory('/var/lib/nova').with(

Loading…
Cancel
Save