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
This commit is contained in:
parent
49d23da167
commit
13ae9c1784
|
@ -77,9 +77,8 @@ when 'rhel' # :pragma-foodcritic: ~FC024 - won't fix this
|
|||
default['openstack']['block-storage']['volume']['iscsi_helper'] = 'lioadm'
|
||||
default['openstack']['block-storage']['platform'] = {
|
||||
'cinder_common_packages' => ['openstack-cinder'],
|
||||
'cinder_api_packages' => ['python-cinderclient'],
|
||||
'cinder_api_packages' => ['openstack-cinder'],
|
||||
'cinder_api_service' => 'openstack-cinder-api',
|
||||
'cinder_client_packages' => ['python-cinderclient'],
|
||||
'cinder_volume_packages' => ['qemu-img'],
|
||||
'cinder_volume_service' => 'openstack-cinder-volume',
|
||||
'cinder_scheduler_packages' => [],
|
||||
|
@ -100,7 +99,7 @@ when 'debian'
|
|||
# operating system user and group names
|
||||
default['openstack']['block-storage']['platform'] = {
|
||||
'cinder_common_packages' => ['cinder-common'],
|
||||
'cinder_api_packages' => ['cinder-api', 'python-cinderclient'],
|
||||
'cinder_api_packages' => ['cinder-api'],
|
||||
'cinder_api_service' => 'cinder-api',
|
||||
'cinder_volume_packages' => ['cinder-volume', 'qemu-utils'],
|
||||
'cinder_volume_service' => 'cinder-volume',
|
||||
|
|
|
@ -13,7 +13,7 @@ version '14.0.0'
|
|||
supports os
|
||||
end
|
||||
|
||||
depends 'apt', '~> 4.0'
|
||||
depends 'apt', '~> 5.0'
|
||||
depends 'openstack-common', '>= 14.0.0'
|
||||
depends 'openstack-identity', '>= 14.0.0'
|
||||
depends 'openstack-image', '>= 14.0.0'
|
||||
|
|
|
@ -41,7 +41,7 @@ if node['openstack']['endpoints']['db']['enabled_slave']
|
|||
db_uri('block-storage', db_user, db_pass, true)
|
||||
end
|
||||
|
||||
if node['openstack']['block-storage']['conf']['DEFAULT']['rpc_backend'] == 'rabbit'
|
||||
unless node['openstack']['block-storage']['conf']['DEFAULT']['rpc_backend'].nil?
|
||||
user = node['openstack']['mq']['block-storage']['rabbit']['userid']
|
||||
node.default['openstack']['block-storage']['conf_secrets']
|
||||
.[]('oslo_messaging_rabbit')['rabbit_userid'] = user
|
||||
|
|
|
@ -1,31 +0,0 @@
|
|||
# encoding: UTF-8
|
||||
#
|
||||
# Cookbook Name:: openstack-block-storage
|
||||
# Recipe:: client
|
||||
#
|
||||
# Copyright 2014, IBM Corp.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
# Make Openstack object available in Chef::Recipe
|
||||
class ::Chef::Recipe
|
||||
include ::Openstack
|
||||
end
|
||||
|
||||
platform_options = node['openstack']['block-storage']['platform']
|
||||
platform_options['cinder_client_packages'].each do |pkg|
|
||||
package pkg do
|
||||
options platform_options['package_overrides']
|
||||
action :upgrade
|
||||
end
|
||||
end
|
|
@ -13,7 +13,7 @@ describe 'openstack-block-storage::api' do
|
|||
include_context 'block-storage-stubs'
|
||||
|
||||
it 'upgrades cinder api package' do
|
||||
expect(chef_run).to upgrade_package 'python-cinderclient'
|
||||
expect(chef_run).to upgrade_package 'openstack-cinder'
|
||||
end
|
||||
|
||||
it 'upgrades mysql python package' do
|
||||
|
|
|
@ -16,7 +16,6 @@ describe 'openstack-block-storage::api' do
|
|||
|
||||
it 'upgrades cinder api packages' do
|
||||
expect(chef_run).to upgrade_package('cinder-api')
|
||||
expect(chef_run).to upgrade_package('python-cinderclient')
|
||||
end
|
||||
|
||||
it 'starts cinder api on boot' do
|
||||
|
|
|
@ -1,16 +0,0 @@
|
|||
# encoding: UTF-8
|
||||
require_relative 'spec_helper'
|
||||
|
||||
describe 'openstack-block-storage::client' do
|
||||
describe 'redhat' do
|
||||
let(:runner) { ChefSpec::SoloRunner.new(REDHAT_OPTS) }
|
||||
let(:node) { runner.node }
|
||||
let(:chef_run) do
|
||||
runner.converge(described_recipe)
|
||||
end
|
||||
|
||||
it 'upgrades packages' do
|
||||
expect(chef_run).to upgrade_package('python-cinderclient')
|
||||
end
|
||||
end
|
||||
end
|
|
@ -1,12 +0,0 @@
|
|||
# encoding: UTF-8
|
||||
require_relative 'spec_helper'
|
||||
|
||||
describe 'openstack-block-storage::client' do
|
||||
describe 'ubuntu' do
|
||||
let(:runner) { ChefSpec::SoloRunner.new(UBUNTU_OPTS) }
|
||||
let(:node) { runner.node }
|
||||
let(:chef_run) do
|
||||
runner.converge(described_recipe)
|
||||
end
|
||||
end
|
||||
end
|
Loading…
Reference in New Issue