diff --git a/attributes/default.rb b/attributes/default.rb index bafb6610..c38eab65 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -140,8 +140,8 @@ 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', - 'api_placement_packages' => ['nova-placement-api'], - 'api_placement_service' => 'nova-placement-api', + 'api_placement_packages' => ['openstack-nova-placement-api'], + 'api_placement_service' => 'openstack-nova-placement-api', 'memcache_python_packages' => ['python-memcached'], 'compute_api_metadata_packages' => ['openstack-nova-api'], 'compute_api_metadata_service' => 'openstack-nova-metadata-api', diff --git a/recipes/nova-cert.rb b/recipes/nova-cert.rb deleted file mode 100644 index f53343d7..00000000 --- a/recipes/nova-cert.rb +++ /dev/null @@ -1,37 +0,0 @@ -# encoding: UTF-8 -# -# Cookbook Name:: openstack-compute -# Recipe:: nova-cert -# -# Copyright 2012, Rackspace US, Inc. -# Copyright 2013, Craig Tracey -# -# 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. - -include_recipe 'openstack-compute::nova-common' - -platform_options = node['openstack']['compute']['platform'] - -platform_options['compute_cert_packages'].each do |pkg| - package pkg do - options platform_options['package_overrides'] - action :upgrade - end -end - -service 'nova-cert' do - service_name platform_options['compute_cert_service'] - supports status: true, restart: true - action [:enable, :start] - subscribes :restart, 'template[/etc/nova/nova.conf]' -end diff --git a/spec/nova-cert-redhat_spec.rb b/spec/nova-cert-redhat_spec.rb deleted file mode 100644 index 44c9d5f2..00000000 --- a/spec/nova-cert-redhat_spec.rb +++ /dev/null @@ -1,21 +0,0 @@ -# encoding: UTF-8 - -require_relative 'spec_helper' - -describe 'openstack-compute::nova-cert' do - describe 'redhat' do - let(:runner) { ChefSpec::SoloRunner.new(REDHAT_OPTS) } - let(:node) { runner.node } - let(:chef_run) { runner.converge(described_recipe) } - - include_context 'compute_stubs' - - it 'upgrades nova cert package' do - expect(chef_run).to upgrade_package 'openstack-nova-cert' - end - - it 'starts nova cert on boot' do - expect(chef_run).to enable_service 'openstack-nova-cert' - end - end -end diff --git a/spec/nova-cert_spec.rb b/spec/nova-cert_spec.rb deleted file mode 100644 index 18c7173f..00000000 --- a/spec/nova-cert_spec.rb +++ /dev/null @@ -1,22 +0,0 @@ -# encoding: UTF-8 - -require_relative 'spec_helper' - -describe 'openstack-compute::nova-cert' do - describe 'ubuntu' do - let(:runner) { ChefSpec::SoloRunner.new(UBUNTU_OPTS) } - let(:node) { runner.node } - let(:chef_run) { runner.converge(described_recipe) } - - include_context 'compute_stubs' - include_examples 'expect_runs_nova_common_recipe' - - it 'upgrades nova cert package' do - expect(chef_run).to upgrade_package('nova-cert') - end - - it 'starts nova cert on boot' do - expect(chef_run).to enable_service('nova-cert') - end - end -end