Merge "Deprecated python-novaclient"

This commit is contained in:
Jenkins 2016-12-20 11:09:36 +00:00 committed by Gerrit Code Review
commit 0aebc9986a
9 changed files with 0 additions and 85 deletions

View File

@ -132,11 +132,9 @@ when 'rhel' # :pragma-foodcritic: ~FC024 - won't fix this
default['openstack']['compute']['platform'] = {
'api_os_compute_packages' => ['openstack-nova-api'],
'api_os_compute_service' => 'openstack-nova-api',
'neutron_python_packages' => ['python-neutronclient', 'pyparsing'],
'memcache_python_packages' => ['python-memcached'],
'compute_api_metadata_packages' => ['openstack-nova-api'],
'compute_api_metadata_service' => 'openstack-nova-metadata-api',
'compute_client_packages' => ['python-novaclient'],
'compute_compute_packages' => ['openstack-nova-compute'],
'qemu_compute_packages' => [],
'kvm_compute_packages' => [],
@ -169,10 +167,8 @@ when 'debian'
'api_os_compute_packages' => ['nova-api-os-compute'],
'api_os_compute_service' => 'nova-api-os-compute',
'memcache_python_packages' => ['python-memcache'],
'neutron_python_packages' => ['python-neutronclient', 'python-pyparsing'],
'compute_api_metadata_packages' => ['nova-api-metadata'],
'compute_api_metadata_service' => 'nova-api-metadata',
'compute_client_packages' => ['python-novaclient'],
'compute_compute_packages' => ['nova-compute'],
'qemu_compute_packages' => ['nova-compute-qemu'],
'kvm_compute_packages' => ['nova-compute-kvm'],

View File

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

View File

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

View File

@ -1,31 +0,0 @@
# encoding: UTF-8
#
# Cookbook Name:: openstack-compute
# 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.
#
class ::Chef::Recipe
include ::Openstack
end
platform_options = node['openstack']['compute']['platform']
platform_options['compute_client_packages'].each do |pkg|
package pkg do
options platform_options['package_overrides']
action :upgrade
end
end

View File

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

View File

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

View File

@ -1,16 +0,0 @@
# encoding: UTF-8
require_relative 'spec_helper'
describe 'openstack-compute::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 python-novaclient package' do
expect(chef_run).to upgrade_package('python-novaclient')
end
end
end

View File

@ -1,16 +0,0 @@
# encoding: UTF-8
require_relative 'spec_helper'
describe 'openstack-compute::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
it 'upgrades python-novaclient package' do
expect(chef_run).to upgrade_package('python-novaclient')
end
end
end

View File

@ -105,12 +105,6 @@ shared_examples 'expect_runs_nova_common_recipe' do
end
end
shared_examples 'expect_upgrades_python_keystoneclient' do
it 'upgrades python-keystoneclient' do
expect(chef_run).to upgrade_package 'python-keystoneclient'
end
end
shared_examples 'expect_creates_nova_state_dir' do
it 'creates the /var/lib/nova/lock directory' do
expect(chef_run).to create_directory('/var/lib/nova').with(