From b547aaa80c8d1131f3f4a04a6ca4bcb1eef49b98 Mon Sep 17 00:00:00 2001 From: Samuel Cassiba Date: Tue, 18 Oct 2016 13:42:31 -0700 Subject: [PATCH] Deprecated python-heatclient - deleted client.rb - deprecated python-heatclient references Implements blueprint newton-xenial Change-Id: I54d8190f77b7731dfb518871f080f62718cedc47 --- attributes/default.rb | 14 ++++++------- recipes/client.rb | 32 ------------------------------ recipes/common.rb | 5 ----- spec/api-cfn-redhat_spec.rb | 4 +--- spec/api-cloudwatch-redhat_spec.rb | 4 +--- spec/api-redhat_spec.rb | 4 +--- spec/client-redhat_spec.rb | 13 ------------ spec/client_spec.rb | 13 ------------ spec/common-redhat_spec.rb | 1 - spec/common_spec.rb | 1 - spec/spec_helper.rb | 8 +------- 11 files changed, 10 insertions(+), 89 deletions(-) delete mode 100644 recipes/client.rb delete mode 100644 spec/client-redhat_spec.rb delete mode 100644 spec/client_spec.rb diff --git a/attributes/default.rb b/attributes/default.rb index 2e07004..4758985 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -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', diff --git a/recipes/client.rb b/recipes/client.rb deleted file mode 100644 index a6c86dd..0000000 --- a/recipes/client.rb +++ /dev/null @@ -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 diff --git a/recipes/common.rb b/recipes/common.rb index eae1765..de0920e 100644 --- a/recipes/common.rb +++ b/recipes/common.rb @@ -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'] diff --git a/spec/api-cfn-redhat_spec.rb b/spec/api-cfn-redhat_spec.rb index d8fc2e7..3343f4f 100644 --- a/spec/api-cfn-redhat_spec.rb +++ b/spec/api-cfn-redhat_spec.rb @@ -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 diff --git a/spec/api-cloudwatch-redhat_spec.rb b/spec/api-cloudwatch-redhat_spec.rb index 6eaac94..4a1dd80 100644 --- a/spec/api-cloudwatch-redhat_spec.rb +++ b/spec/api-cloudwatch-redhat_spec.rb @@ -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 diff --git a/spec/api-redhat_spec.rb b/spec/api-redhat_spec.rb index c06b472..8688067 100644 --- a/spec/api-redhat_spec.rb +++ b/spec/api-redhat_spec.rb @@ -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 diff --git a/spec/client-redhat_spec.rb b/spec/client-redhat_spec.rb deleted file mode 100644 index 104642b..0000000 --- a/spec/client-redhat_spec.rb +++ /dev/null @@ -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 diff --git a/spec/client_spec.rb b/spec/client_spec.rb deleted file mode 100644 index 27b3f5a..0000000 --- a/spec/client_spec.rb +++ /dev/null @@ -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 diff --git a/spec/common-redhat_spec.rb b/spec/common-redhat_spec.rb index d2fc8be..3c4913a 100644 --- a/spec/common-redhat_spec.rb +++ b/spec/common-redhat_spec.rb @@ -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' diff --git a/spec/common_spec.rb b/spec/common_spec.rb index 928c27d..3fe4efa 100644 --- a/spec/common_spec.rb +++ b/spec/common_spec.rb @@ -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' diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 7933012..3bb2a83 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -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'