diff --git a/attributes/default.rb b/attributes/default.rb index fa19c39..8306ce4 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -98,7 +98,6 @@ when 'rhel' 'agent_notification_service' => 'openstack-ceilometer-notification', 'api_packages' => ['openstack-ceilometer-api'], 'api_service' => 'openstack-ceilometer-api', - 'client_packages' => ['python-ceilometerclient', 'python-gnocchiclient'], 'collector_packages' => ['openstack-ceilometer-collector'], 'collector_service' => 'openstack-ceilometer-collector', 'package_overrides' => '' @@ -120,7 +119,6 @@ when 'debian' 'gnocchi-api_wsgi_file' => '/usr/share/gnocchi-common/app.wsgi', 'api_packages' => ['ceilometer-api'], 'api_service' => 'ceilometer-api', - 'client_packages' => ['python-ceilometerclient', 'python-gnocchiclient'], 'collector_packages' => ['ceilometer-collector', 'python-mysqldb'], 'collector_service' => 'ceilometer-collector', 'package_overrides' => "-o Dpkg::Options::='--force-confold' -o Dpkg::Options::='--force-confdef'" diff --git a/recipes/client.rb b/recipes/client.rb deleted file mode 100644 index 17a905f..0000000 --- a/recipes/client.rb +++ /dev/null @@ -1,31 +0,0 @@ -# encoding: UTF-8 -# -# Cookbook Name:: openstack-telemetry -# 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 = node['openstack']['telemetry']['platform'] -platform['client_packages'].each do |pkg| - package pkg do - options platform['package_overrides'] - action :upgrade - end -end diff --git a/spec/client-redhat_spec.rb b/spec/client-redhat_spec.rb deleted file mode 100644 index 6d0e4ad..0000000 --- a/spec/client-redhat_spec.rb +++ /dev/null @@ -1,15 +0,0 @@ -# encoding: UTF-8 - -require_relative 'spec_helper' - -describe 'openstack-telemetry::client' do - describe 'redhat' do - let(:runner) { ChefSpec::SoloRunner.new(REDHAT_OPTS) } - let(:node) { runner.node } - let(:chef_run) { runner.converge(described_recipe) } - - it 'installs packages' do - expect(chef_run).to upgrade_package('python-ceilometerclient') - end - end -end diff --git a/spec/client_spec.rb b/spec/client_spec.rb deleted file mode 100644 index 461d5a4..0000000 --- a/spec/client_spec.rb +++ /dev/null @@ -1,19 +0,0 @@ -# encoding: UTF-8 - -require_relative 'spec_helper' - -describe 'openstack-telemetry::client' do - describe 'ubuntu' do - let(:runner) { ChefSpec::SoloRunner.new(UBUNTU_OPTS) } - let(:node) { runner.node } - let(:chef_run) { runner.converge(described_recipe) } - - it do - expect(chef_run).to upgrade_package('python-ceilometerclient') - end - - it do - expect(chef_run).to upgrade_package('python-gnocchiclient') - end - end -end