summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Cassiba <s@cassiba.com>2017-04-07 15:20:22 -0700
committerSamuel Cassiba <s@cassiba.com>2017-04-14 06:44:07 -0700
commit814f02723094aaeac94f31b0bdb5f63647b3edb0 (patch)
treea2652856e0083525f7ac0a57908884f69bc6150a
parent40b6a0627323e264fdd8378277bcd552841e38c1 (diff)
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
Notes
Notes (review): Code-Review+1: Jens Rosenboom <j.rosenboom@x-ion.de> Code-Review+2: Jan Klare <j.klare@cloudbau.de> Code-Review+2: Christoph Albers <c.albers@x-ion.de> Workflow+1: Christoph Albers <c.albers@x-ion.de> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Wed, 19 Apr 2017 15:35:49 +0000 Reviewed-on: https://review.openstack.org/454907 Project: openstack/cookbook-openstack-compute Branch: refs/heads/master
-rw-r--r--attributes/default.rb4
-rw-r--r--recipes/nova-cert.rb37
-rw-r--r--spec/nova-cert-redhat_spec.rb21
-rw-r--r--spec/nova-cert_spec.rb22
4 files changed, 2 insertions, 82 deletions
diff --git a/attributes/default.rb b/attributes/default.rb
index bafb661..c38eab6 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -140,8 +140,8 @@ when 'rhel' # :pragma-foodcritic: ~FC024 - won't fix this
140 default['openstack']['compute']['platform'] = { 140 default['openstack']['compute']['platform'] = {
141 'api_os_compute_packages' => ['openstack-nova-api'], 141 'api_os_compute_packages' => ['openstack-nova-api'],
142 'api_os_compute_service' => 'openstack-nova-api', 142 'api_os_compute_service' => 'openstack-nova-api',
143 'api_placement_packages' => ['nova-placement-api'], 143 'api_placement_packages' => ['openstack-nova-placement-api'],
144 'api_placement_service' => 'nova-placement-api', 144 'api_placement_service' => 'openstack-nova-placement-api',
145 'memcache_python_packages' => ['python-memcached'], 145 'memcache_python_packages' => ['python-memcached'],
146 'compute_api_metadata_packages' => ['openstack-nova-api'], 146 'compute_api_metadata_packages' => ['openstack-nova-api'],
147 'compute_api_metadata_service' => 'openstack-nova-metadata-api', 147 '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 f53343d..0000000
--- a/recipes/nova-cert.rb
+++ /dev/null
@@ -1,37 +0,0 @@
1# encoding: UTF-8
2#
3# Cookbook Name:: openstack-compute
4# Recipe:: nova-cert
5#
6# Copyright 2012, Rackspace US, Inc.
7# Copyright 2013, Craig Tracey <craigtracey@gmail.com>
8#
9# Licensed under the Apache License, Version 2.0 (the "License");
10# you may not use this file except in compliance with the License.
11# You may obtain a copy of the License at
12#
13# http://www.apache.org/licenses/LICENSE-2.0
14#
15# Unless required by applicable law or agreed to in writing, software
16# distributed under the License is distributed on an "AS IS" BASIS,
17# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18# See the License for the specific language governing permissions and
19# limitations under the License.
20
21include_recipe 'openstack-compute::nova-common'
22
23platform_options = node['openstack']['compute']['platform']
24
25platform_options['compute_cert_packages'].each do |pkg|
26 package pkg do
27 options platform_options['package_overrides']
28 action :upgrade
29 end
30end
31
32service 'nova-cert' do
33 service_name platform_options['compute_cert_service']
34 supports status: true, restart: true
35 action [:enable, :start]
36 subscribes :restart, 'template[/etc/nova/nova.conf]'
37end
diff --git a/spec/nova-cert-redhat_spec.rb b/spec/nova-cert-redhat_spec.rb
deleted file mode 100644
index 44c9d5f..0000000
--- a/spec/nova-cert-redhat_spec.rb
+++ /dev/null
@@ -1,21 +0,0 @@
1# encoding: UTF-8
2
3require_relative 'spec_helper'
4
5describe 'openstack-compute::nova-cert' do
6 describe 'redhat' do
7 let(:runner) { ChefSpec::SoloRunner.new(REDHAT_OPTS) }
8 let(:node) { runner.node }
9 let(:chef_run) { runner.converge(described_recipe) }
10
11 include_context 'compute_stubs'
12
13 it 'upgrades nova cert package' do
14 expect(chef_run).to upgrade_package 'openstack-nova-cert'
15 end
16
17 it 'starts nova cert on boot' do
18 expect(chef_run).to enable_service 'openstack-nova-cert'
19 end
20 end
21end
diff --git a/spec/nova-cert_spec.rb b/spec/nova-cert_spec.rb
deleted file mode 100644
index 18c7173..0000000
--- a/spec/nova-cert_spec.rb
+++ /dev/null
@@ -1,22 +0,0 @@
1# encoding: UTF-8
2
3require_relative 'spec_helper'
4
5describe 'openstack-compute::nova-cert' do
6 describe 'ubuntu' do
7 let(:runner) { ChefSpec::SoloRunner.new(UBUNTU_OPTS) }
8 let(:node) { runner.node }
9 let(:chef_run) { runner.converge(described_recipe) }
10
11 include_context 'compute_stubs'
12 include_examples 'expect_runs_nova_common_recipe'
13
14 it 'upgrades nova cert package' do
15 expect(chef_run).to upgrade_package('nova-cert')
16 end
17
18 it 'starts nova cert on boot' do
19 expect(chef_run).to enable_service('nova-cert')
20 end
21 end
22end