Browse Source

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
changes/07/454907/4
Samuel Cassiba 2 years ago
parent
commit
814f027230
4 changed files with 2 additions and 82 deletions
  1. 2
    2
      attributes/default.rb
  2. 0
    37
      recipes/nova-cert.rb
  3. 0
    21
      spec/nova-cert-redhat_spec.rb
  4. 0
    22
      spec/nova-cert_spec.rb

+ 2
- 2
attributes/default.rb View File

@@ -140,8 +140,8 @@ when 'rhel' # :pragma-foodcritic: ~FC024 - won't fix this
140 140
   default['openstack']['compute']['platform'] = {
141 141
     'api_os_compute_packages' => ['openstack-nova-api'],
142 142
     'api_os_compute_service' => 'openstack-nova-api',
143
-    'api_placement_packages' => ['nova-placement-api'],
144
-    'api_placement_service' => 'nova-placement-api',
143
+    'api_placement_packages' => ['openstack-nova-placement-api'],
144
+    'api_placement_service' => 'openstack-nova-placement-api',
145 145
     'memcache_python_packages' => ['python-memcached'],
146 146
     'compute_api_metadata_packages' => ['openstack-nova-api'],
147 147
     'compute_api_metadata_service' => 'openstack-nova-metadata-api',

+ 0
- 37
recipes/nova-cert.rb View File

@@ -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
-
21
-include_recipe 'openstack-compute::nova-common'
22
-
23
-platform_options = node['openstack']['compute']['platform']
24
-
25
-platform_options['compute_cert_packages'].each do |pkg|
26
-  package pkg do
27
-    options platform_options['package_overrides']
28
-    action :upgrade
29
-  end
30
-end
31
-
32
-service '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]'
37
-end

+ 0
- 21
spec/nova-cert-redhat_spec.rb View File

@@ -1,21 +0,0 @@
1
-# encoding: UTF-8
2
-
3
-require_relative 'spec_helper'
4
-
5
-describe '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
21
-end

+ 0
- 22
spec/nova-cert_spec.rb View File

@@ -1,22 +0,0 @@
1
-# encoding: UTF-8
2
-
3
-require_relative 'spec_helper'
4
-
5
-describe '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
22
-end

Loading…
Cancel
Save