Browse Source

Deprecated python-cinderclient

- deleted client.rb
- deprecated python-cinderclient references
- incremented apt to 5.0

Implements blueprint newton-xenial
Depends-On: I57c8729e8732161ac34caa85259de8264e99c56d

Change-Id: I1b8c34eea50ed10d6c040caa89802dd64124ec74
Samuel Cassiba 2 years ago
parent
commit
13ae9c1784

+ 2
- 3
attributes/default.rb View File

@@ -77,9 +77,8 @@ when 'rhel' # :pragma-foodcritic: ~FC024 - won't fix this
77 77
   default['openstack']['block-storage']['volume']['iscsi_helper'] = 'lioadm'
78 78
   default['openstack']['block-storage']['platform'] = {
79 79
     'cinder_common_packages' => ['openstack-cinder'],
80
-    'cinder_api_packages' => ['python-cinderclient'],
80
+    'cinder_api_packages' => ['openstack-cinder'],
81 81
     'cinder_api_service' => 'openstack-cinder-api',
82
-    'cinder_client_packages' => ['python-cinderclient'],
83 82
     'cinder_volume_packages' => ['qemu-img'],
84 83
     'cinder_volume_service' => 'openstack-cinder-volume',
85 84
     'cinder_scheduler_packages' => [],
@@ -100,7 +99,7 @@ when 'debian'
100 99
   # operating system user and group names
101 100
   default['openstack']['block-storage']['platform'] = {
102 101
     'cinder_common_packages' => ['cinder-common'],
103
-    'cinder_api_packages' => ['cinder-api', 'python-cinderclient'],
102
+    'cinder_api_packages' => ['cinder-api'],
104 103
     'cinder_api_service' => 'cinder-api',
105 104
     'cinder_volume_packages' => ['cinder-volume', 'qemu-utils'],
106 105
     'cinder_volume_service' => 'cinder-volume',

+ 1
- 1
metadata.rb View File

@@ -13,7 +13,7 @@ version '14.0.0'
13 13
   supports os
14 14
 end
15 15
 
16
-depends 'apt', '~> 4.0'
16
+depends 'apt', '~> 5.0'
17 17
 depends 'openstack-common', '>= 14.0.0'
18 18
 depends 'openstack-identity', '>= 14.0.0'
19 19
 depends 'openstack-image', '>= 14.0.0'

+ 1
- 1
recipes/cinder-common.rb View File

@@ -41,7 +41,7 @@ if node['openstack']['endpoints']['db']['enabled_slave']
41 41
     db_uri('block-storage', db_user, db_pass, true)
42 42
 end
43 43
 
44
-if node['openstack']['block-storage']['conf']['DEFAULT']['rpc_backend'] == 'rabbit'
44
+unless node['openstack']['block-storage']['conf']['DEFAULT']['rpc_backend'].nil?
45 45
   user = node['openstack']['mq']['block-storage']['rabbit']['userid']
46 46
   node.default['openstack']['block-storage']['conf_secrets']
47 47
     .[]('oslo_messaging_rabbit')['rabbit_userid'] = user

+ 0
- 31
recipes/client.rb View File

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

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

@@ -13,7 +13,7 @@ describe 'openstack-block-storage::api' do
13 13
     include_context 'block-storage-stubs'
14 14
 
15 15
     it 'upgrades cinder api package' do
16
-      expect(chef_run).to upgrade_package 'python-cinderclient'
16
+      expect(chef_run).to upgrade_package 'openstack-cinder'
17 17
     end
18 18
 
19 19
     it 'upgrades mysql python package' do

+ 0
- 1
spec/api_spec.rb View File

@@ -16,7 +16,6 @@ describe 'openstack-block-storage::api' do
16 16
 
17 17
     it 'upgrades cinder api packages' do
18 18
       expect(chef_run).to upgrade_package('cinder-api')
19
-      expect(chef_run).to upgrade_package('python-cinderclient')
20 19
     end
21 20
 
22 21
     it 'starts cinder api on boot' 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-block-storage::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 packages' do
13
-      expect(chef_run).to upgrade_package('python-cinderclient')
14
-    end
15
-  end
16
-end

+ 0
- 12
spec/client_spec.rb View File

@@ -1,12 +0,0 @@
1
-# encoding: UTF-8
2
-require_relative 'spec_helper'
3
-
4
-describe 'openstack-block-storage::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
-  end
12
-end

Loading…
Cancel
Save