Deprecated nova-cert, fixups for Ocata
- nova-cert is deprecated and causes build failures if attempts to utilize it are made. - nova-placement-api package is prefixed with openstack- in RDO. Change-Id: Iea2070467503f9a434e927e2580ef2b4135e98f7
This commit is contained in:
parent
40b6a06273
commit
814f027230
|
@ -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',
|
||||
|
|
|
@ -1,37 +0,0 @@
|
|||
# encoding: UTF-8
|
||||
#
|
||||
# Cookbook Name:: openstack-compute
|
||||
# Recipe:: nova-cert
|
||||
#
|
||||
# Copyright 2012, Rackspace US, Inc.
|
||||
# Copyright 2013, Craig Tracey <craigtracey@gmail.com>
|
||||
#
|
||||
# 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
|
|
@ -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
|
|
@ -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
|
Loading…
Reference in New Issue