summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Cassiba <s@cassiba.com>2016-10-18 07:29:49 -0700
committerChristoph Albers <c.albers@x-ion.de>2016-12-20 08:40:40 +0000
commit5261813e40883cc1b7ddeaa12d1932e52ecabdd7 (patch)
treed736f4147e860e8693cc0e861362a56cf72e14c6
parent1993d880f2737f545693879afc8283a541e232b7 (diff)
Deprecated python-novaclient
- deleted client.rb - deprecated python-novaclient references - removed neutron packages Implements blueprint newton-xenial Change-Id: I8ff0dcad66ab937f18faf82e6af0cc626dfff15a
Notes
Notes (review): Code-Review+2: Christoph Albers <c.albers@x-ion.de> Workflow+1: Jan Klare <j.klare@cloudbau.de> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 20 Dec 2016 11:09:36 +0000 Reviewed-on: https://review.openstack.org/388043 Project: openstack/cookbook-openstack-compute Branch: refs/heads/master
-rw-r--r--attributes/default.rb4
-rw-r--r--recipes/api-metadata.rb5
-rw-r--r--recipes/api-os-compute.rb5
-rw-r--r--recipes/client.rb31
-rw-r--r--spec/api-metadata_spec.rb1
-rw-r--r--spec/api-os-compute_spec.rb1
-rw-r--r--spec/client-redhat_spec.rb16
-rw-r--r--spec/client_spec.rb16
-rw-r--r--spec/spec_helper.rb6
9 files changed, 0 insertions, 85 deletions
diff --git a/attributes/default.rb b/attributes/default.rb
index 7f59eac..8e31ec3 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -132,11 +132,9 @@ when 'rhel' # :pragma-foodcritic: ~FC024 - won't fix this
132 default['openstack']['compute']['platform'] = { 132 default['openstack']['compute']['platform'] = {
133 'api_os_compute_packages' => ['openstack-nova-api'], 133 'api_os_compute_packages' => ['openstack-nova-api'],
134 'api_os_compute_service' => 'openstack-nova-api', 134 'api_os_compute_service' => 'openstack-nova-api',
135 'neutron_python_packages' => ['python-neutronclient', 'pyparsing'],
136 'memcache_python_packages' => ['python-memcached'], 135 'memcache_python_packages' => ['python-memcached'],
137 'compute_api_metadata_packages' => ['openstack-nova-api'], 136 'compute_api_metadata_packages' => ['openstack-nova-api'],
138 'compute_api_metadata_service' => 'openstack-nova-metadata-api', 137 'compute_api_metadata_service' => 'openstack-nova-metadata-api',
139 'compute_client_packages' => ['python-novaclient'],
140 'compute_compute_packages' => ['openstack-nova-compute'], 138 'compute_compute_packages' => ['openstack-nova-compute'],
141 'qemu_compute_packages' => [], 139 'qemu_compute_packages' => [],
142 'kvm_compute_packages' => [], 140 'kvm_compute_packages' => [],
@@ -169,10 +167,8 @@ when 'debian'
169 'api_os_compute_packages' => ['nova-api-os-compute'], 167 'api_os_compute_packages' => ['nova-api-os-compute'],
170 'api_os_compute_service' => 'nova-api-os-compute', 168 'api_os_compute_service' => 'nova-api-os-compute',
171 'memcache_python_packages' => ['python-memcache'], 169 'memcache_python_packages' => ['python-memcache'],
172 'neutron_python_packages' => ['python-neutronclient', 'python-pyparsing'],
173 'compute_api_metadata_packages' => ['nova-api-metadata'], 170 'compute_api_metadata_packages' => ['nova-api-metadata'],
174 'compute_api_metadata_service' => 'nova-api-metadata', 171 'compute_api_metadata_service' => 'nova-api-metadata',
175 'compute_client_packages' => ['python-novaclient'],
176 'compute_compute_packages' => ['nova-compute'], 172 'compute_compute_packages' => ['nova-compute'],
177 'qemu_compute_packages' => ['nova-compute-qemu'], 173 'qemu_compute_packages' => ['nova-compute-qemu'],
178 'kvm_compute_packages' => ['nova-compute-kvm'], 174 'kvm_compute_packages' => ['nova-compute-kvm'],
diff --git a/recipes/api-metadata.rb b/recipes/api-metadata.rb
index f98e9b2..6d370ed 100644
--- a/recipes/api-metadata.rb
+++ b/recipes/api-metadata.rb
@@ -29,11 +29,6 @@ include_recipe 'openstack-compute::nova-common'
29 29
30platform_options = node['openstack']['compute']['platform'] 30platform_options = node['openstack']['compute']['platform']
31 31
32# NOTE(mrodden): required for keystone auth middleware
33package 'python-keystoneclient' do
34 action :upgrade
35end
36
37platform_options['compute_api_metadata_packages'].each do |pkg| 32platform_options['compute_api_metadata_packages'].each do |pkg|
38 package pkg do 33 package pkg do
39 options platform_options['package_overrides'] 34 options platform_options['package_overrides']
diff --git a/recipes/api-os-compute.rb b/recipes/api-os-compute.rb
index daedb61..3dacf28 100644
--- a/recipes/api-os-compute.rb
+++ b/recipes/api-os-compute.rb
@@ -32,11 +32,6 @@ directory ::File.dirname(node['openstack']['compute']['conf']['keystone_authtoke
32 mode 00700 32 mode 00700
33end 33end
34 34
35# NOTE(mrodden): required for keystone auth middleware
36package 'python-keystoneclient' do
37 action :upgrade
38end
39
40platform_options['api_os_compute_packages'].each do |pkg| 35platform_options['api_os_compute_packages'].each do |pkg|
41 package pkg do 36 package pkg do
42 options platform_options['package_overrides'] 37 options platform_options['package_overrides']
diff --git a/recipes/client.rb b/recipes/client.rb
deleted file mode 100644
index 1a4aae0..0000000
--- a/recipes/client.rb
+++ /dev/null
@@ -1,31 +0,0 @@
1# encoding: UTF-8
2#
3# Cookbook Name:: openstack-compute
4# Recipe:: client
5#
6# Copyright 2014, IBM Corp.
7#
8# Licensed under the Apache License, Version 2.0 (the "License");
9# you may not use this file except in compliance with the License.
10# You may obtain a copy of the License at
11#
12# http://www.apache.org/licenses/LICENSE-2.0
13#
14# Unless required by applicable law or agreed to in writing, software
15# distributed under the License is distributed on an "AS IS" BASIS,
16# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17# See the License for the specific language governing permissions and
18# limitations under the License.
19#
20
21class ::Chef::Recipe
22 include ::Openstack
23end
24
25platform_options = node['openstack']['compute']['platform']
26platform_options['compute_client_packages'].each do |pkg|
27 package pkg do
28 options platform_options['package_overrides']
29 action :upgrade
30 end
31end
diff --git a/spec/api-metadata_spec.rb b/spec/api-metadata_spec.rb
index dc96687..9c4d909 100644
--- a/spec/api-metadata_spec.rb
+++ b/spec/api-metadata_spec.rb
@@ -12,7 +12,6 @@ describe 'openstack-compute::api-metadata' do
12 include_examples 'expect_runs_nova_common_recipe' 12 include_examples 'expect_runs_nova_common_recipe'
13 include_examples 'expect_creates_nova_state_dir' 13 include_examples 'expect_creates_nova_state_dir'
14 include_examples 'expect_creates_nova_lock_dir' 14 include_examples 'expect_creates_nova_lock_dir'
15 include_examples 'expect_upgrades_python_keystoneclient'
16 include_examples 'expect_creates_api_paste_template' 15 include_examples 'expect_creates_api_paste_template'
17 16
18 it 'upgrades metadata api packages' do 17 it 'upgrades metadata api packages' do
diff --git a/spec/api-os-compute_spec.rb b/spec/api-os-compute_spec.rb
index e735449..1cd9bfa 100644
--- a/spec/api-os-compute_spec.rb
+++ b/spec/api-os-compute_spec.rb
@@ -12,7 +12,6 @@ describe 'openstack-compute::api-os-compute' do
12 include_examples 'expect_runs_nova_common_recipe' 12 include_examples 'expect_runs_nova_common_recipe'
13 include_examples 'expect_creates_nova_state_dir' 13 include_examples 'expect_creates_nova_state_dir'
14 include_examples 'expect_creates_nova_lock_dir' 14 include_examples 'expect_creates_nova_lock_dir'
15 include_examples 'expect_upgrades_python_keystoneclient'
16 include_examples 'expect_creates_api_paste_template' 15 include_examples 'expect_creates_api_paste_template'
17 16
18 it 'creates the /var/cache/nova directory' do 17 it 'creates the /var/cache/nova directory' do
diff --git a/spec/client-redhat_spec.rb b/spec/client-redhat_spec.rb
deleted file mode 100644
index a33ffec..0000000
--- a/spec/client-redhat_spec.rb
+++ /dev/null
@@ -1,16 +0,0 @@
1# encoding: UTF-8
2require_relative 'spec_helper'
3
4describe 'openstack-compute::client' do
5 describe 'redhat' do
6 let(:runner) { ChefSpec::SoloRunner.new(REDHAT_OPTS) }
7 let(:node) { runner.node }
8 let(:chef_run) do
9 runner.converge(described_recipe)
10 end
11
12 it 'upgrades python-novaclient package' do
13 expect(chef_run).to upgrade_package('python-novaclient')
14 end
15 end
16end
diff --git a/spec/client_spec.rb b/spec/client_spec.rb
deleted file mode 100644
index 28e6693..0000000
--- a/spec/client_spec.rb
+++ /dev/null
@@ -1,16 +0,0 @@
1# encoding: UTF-8
2require_relative 'spec_helper'
3
4describe 'openstack-compute::client' do
5 describe 'ubuntu' do
6 let(:runner) { ChefSpec::SoloRunner.new(UBUNTU_OPTS) }
7 let(:node) { runner.node }
8 let(:chef_run) do
9 runner.converge(described_recipe)
10 end
11
12 it 'upgrades python-novaclient package' do
13 expect(chef_run).to upgrade_package('python-novaclient')
14 end
15 end
16end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index f5eebc1..37f92e7 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -105,12 +105,6 @@ shared_examples 'expect_runs_nova_common_recipe' do
105 end 105 end
106end 106end
107 107
108shared_examples 'expect_upgrades_python_keystoneclient' do
109 it 'upgrades python-keystoneclient' do
110 expect(chef_run).to upgrade_package 'python-keystoneclient'
111 end
112end
113
114shared_examples 'expect_creates_nova_state_dir' do 108shared_examples 'expect_creates_nova_state_dir' do
115 it 'creates the /var/lib/nova/lock directory' do 109 it 'creates the /var/lib/nova/lock directory' do
116 expect(chef_run).to create_directory('/var/lib/nova').with( 110 expect(chef_run).to create_directory('/var/lib/nova').with(