Deprecated python-heatclient

- deleted client.rb
- deprecated python-heatclient references

Implements blueprint newton-xenial

Change-Id: I54d8190f77b7731dfb518871f080f62718cedc47
This commit is contained in:
Samuel Cassiba 2016-10-18 13:42:31 -07:00 committed by Samuel Cassiba
parent f2c3db560e
commit b547aaa80c
11 changed files with 10 additions and 89 deletions

View File

@ -69,12 +69,11 @@ when 'rhel'
default['openstack']['orchestration']['group'] = 'heat'
default['openstack']['orchestration']['platform'] = {
'heat_common_packages' => ['openstack-heat-common'],
'heat_client_packages' => ['python-heatclient'],
'heat_api_packages' => ['openstack-heat-api', 'python-heatclient'],
'heat_api_packages' => ['openstack-heat-api'],
'heat_api_service' => 'openstack-heat-api',
'heat_api_cfn_packages' => ['openstack-heat-api-cfn', 'python-heatclient'],
'heat_api_cfn_packages' => ['openstack-heat-api-cfn'],
'heat_api_cfn_service' => 'openstack-heat-api-cfn',
'heat_api_cloudwatch_packages' => ['openstack-heat-api-cloudwatch', 'python-heatclient'],
'heat_api_cloudwatch_packages' => ['openstack-heat-api-cloudwatch'],
'heat_api_cloudwatch_service' => 'openstack-heat-api-cloudwatch',
'heat_engine_packages' => ['openstack-heat-engine'],
'heat_engine_service' => 'openstack-heat-engine',
@ -86,12 +85,11 @@ when 'debian'
default['openstack']['orchestration']['group'] = 'heat'
default['openstack']['orchestration']['platform'] = {
'heat_common_packages' => ['heat-common'],
'heat_client_packages' => ['python-heatclient'],
'heat_api_packages' => ['heat-api', 'python-heatclient'],
'heat_api_packages' => ['heat-api'],
'heat_api_service' => 'heat-api',
'heat_api_cfn_packages' => ['heat-api-cfn', 'python-heatclient'],
'heat_api_cfn_packages' => ['heat-api-cfn'],
'heat_api_cfn_service' => 'heat-api-cfn',
'heat_api_cloudwatch_packages' => ['heat-api-cloudwatch', 'python-heatclient'],
'heat_api_cloudwatch_packages' => ['heat-api-cloudwatch'],
'heat_api_cloudwatch_service' => 'heat-api-cloudwatch',
'heat_engine_packages' => ['heat-engine'],
'heat_engine_service' => 'heat-engine',

View File

@ -1,32 +0,0 @@
# encoding: UTF-8
#
# Cookbook Name:: openstack-orchestration
# 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 # rubocop:disable Documentation
include ::Openstack
end
platform_options = node['openstack']['orchestration']['platform']
platform_options['heat_client_packages'].each do |pkg|
package pkg do
options platform_options['package_overrides']
action :upgrade
end
end

View File

@ -29,11 +29,6 @@ end
platform_options = node['openstack']['orchestration']['platform']
package 'python-keystoneclient' do
options platform_options['package_overrides']
action :upgrade
end
platform_options['heat_common_packages'].each do |pkg|
package pkg do
options platform_options['package_overrides']

View File

@ -11,9 +11,7 @@ describe 'openstack-orchestration::api-cfn' do
include_examples 'expect runs openstack orchestration common recipe'
it 'installs heat cfn packages' do
['openstack-heat-api-cfn', 'python-heatclient'].each do |pkg|
expect(chef_run).to upgrade_package pkg
end
expect(chef_run).to upgrade_package 'openstack-heat-api-cfn'
end
it 'starts heat api-cfn on boot' do

View File

@ -11,9 +11,7 @@ describe 'openstack-orchestration::api-cloudwatch' do
include_examples 'expect runs openstack orchestration common recipe'
it 'installs heat cloudwatch packages' do
['openstack-heat-api-cloudwatch', 'python-heatclient'].each do |pkg|
expect(chef_run).to upgrade_package pkg
end
expect(chef_run).to upgrade_package 'openstack-heat-api-cloudwatch'
end
it 'starts heat api-cloudwatch on boot' do

View File

@ -11,9 +11,7 @@ describe 'openstack-orchestration::api' do
include_examples 'expect runs openstack orchestration common recipe'
it 'installs heat api packages' do
['openstack-heat-api', 'python-heatclient'].each do |pkg|
expect(chef_run).to upgrade_package pkg
end
expect(chef_run).to upgrade_package 'openstack-heat-api'
end
it 'starts heat api on boot' do

View File

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

View File

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

View File

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

View File

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

View File

@ -14,7 +14,7 @@ REDHAT_OPTS = {
}.freeze
UBUNTU_OPTS = {
platform: 'ubuntu',
version: '14.04',
version: '16.04',
log_level: ::LOG_LEVEL
}.freeze
SUSE_OPTS = {
@ -62,12 +62,6 @@ shared_examples 'expect runs openstack orchestration common recipe' do
end
end
shared_examples 'expect installs python keystoneclient' do
it 'installs python-keystoneclient' do
expect(chef_run).to upgrade_package 'python-keystoneclient'
end
end
shared_examples 'expect runs openstack common logging recipe' do
it 'runs logging recipe if node attributes say to' do
expect(chef_run).to include_recipe 'openstack-common::logging'