summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Cassiba <samuel.cassiba@workday.com>2016-10-18 13:42:31 -0700
committerSamuel Cassiba <s@cassiba.com>2016-12-14 20:06:29 -0800
commitb547aaa80c8d1131f3f4a04a6ca4bcb1eef49b98 (patch)
tree3895a513de02c5d1096381f169029fcabffc84f8
parentf2c3db560e4f1a0b527fa186d7979ad79c430cbd (diff)
Deprecated python-heatclient
- deleted client.rb - deprecated python-heatclient references Implements blueprint newton-xenial Change-Id: I54d8190f77b7731dfb518871f080f62718cedc47
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:02:08 +0000 Reviewed-on: https://review.openstack.org/388207 Project: openstack/cookbook-openstack-orchestration Branch: refs/heads/master
-rw-r--r--attributes/default.rb14
-rw-r--r--recipes/client.rb32
-rw-r--r--recipes/common.rb5
-rw-r--r--spec/api-cfn-redhat_spec.rb4
-rw-r--r--spec/api-cloudwatch-redhat_spec.rb4
-rw-r--r--spec/api-redhat_spec.rb4
-rw-r--r--spec/client-redhat_spec.rb13
-rw-r--r--spec/client_spec.rb13
-rw-r--r--spec/common-redhat_spec.rb1
-rw-r--r--spec/common_spec.rb1
-rw-r--r--spec/spec_helper.rb8
11 files changed, 10 insertions, 89 deletions
diff --git a/attributes/default.rb b/attributes/default.rb
index 2e07004..4758985 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -69,12 +69,11 @@ when 'rhel'
69 default['openstack']['orchestration']['group'] = 'heat' 69 default['openstack']['orchestration']['group'] = 'heat'
70 default['openstack']['orchestration']['platform'] = { 70 default['openstack']['orchestration']['platform'] = {
71 'heat_common_packages' => ['openstack-heat-common'], 71 'heat_common_packages' => ['openstack-heat-common'],
72 'heat_client_packages' => ['python-heatclient'], 72 'heat_api_packages' => ['openstack-heat-api'],
73 'heat_api_packages' => ['openstack-heat-api', 'python-heatclient'],
74 'heat_api_service' => 'openstack-heat-api', 73 'heat_api_service' => 'openstack-heat-api',
75 'heat_api_cfn_packages' => ['openstack-heat-api-cfn', 'python-heatclient'], 74 'heat_api_cfn_packages' => ['openstack-heat-api-cfn'],
76 'heat_api_cfn_service' => 'openstack-heat-api-cfn', 75 'heat_api_cfn_service' => 'openstack-heat-api-cfn',
77 'heat_api_cloudwatch_packages' => ['openstack-heat-api-cloudwatch', 'python-heatclient'], 76 'heat_api_cloudwatch_packages' => ['openstack-heat-api-cloudwatch'],
78 'heat_api_cloudwatch_service' => 'openstack-heat-api-cloudwatch', 77 'heat_api_cloudwatch_service' => 'openstack-heat-api-cloudwatch',
79 'heat_engine_packages' => ['openstack-heat-engine'], 78 'heat_engine_packages' => ['openstack-heat-engine'],
80 'heat_engine_service' => 'openstack-heat-engine', 79 'heat_engine_service' => 'openstack-heat-engine',
@@ -86,12 +85,11 @@ when 'debian'
86 default['openstack']['orchestration']['group'] = 'heat' 85 default['openstack']['orchestration']['group'] = 'heat'
87 default['openstack']['orchestration']['platform'] = { 86 default['openstack']['orchestration']['platform'] = {
88 'heat_common_packages' => ['heat-common'], 87 'heat_common_packages' => ['heat-common'],
89 'heat_client_packages' => ['python-heatclient'], 88 'heat_api_packages' => ['heat-api'],
90 'heat_api_packages' => ['heat-api', 'python-heatclient'],
91 'heat_api_service' => 'heat-api', 89 'heat_api_service' => 'heat-api',
92 'heat_api_cfn_packages' => ['heat-api-cfn', 'python-heatclient'], 90 'heat_api_cfn_packages' => ['heat-api-cfn'],
93 'heat_api_cfn_service' => 'heat-api-cfn', 91 'heat_api_cfn_service' => 'heat-api-cfn',
94 'heat_api_cloudwatch_packages' => ['heat-api-cloudwatch', 'python-heatclient'], 92 'heat_api_cloudwatch_packages' => ['heat-api-cloudwatch'],
95 'heat_api_cloudwatch_service' => 'heat-api-cloudwatch', 93 'heat_api_cloudwatch_service' => 'heat-api-cloudwatch',
96 'heat_engine_packages' => ['heat-engine'], 94 'heat_engine_packages' => ['heat-engine'],
97 'heat_engine_service' => 'heat-engine', 95 'heat_engine_service' => 'heat-engine',
diff --git a/recipes/client.rb b/recipes/client.rb
deleted file mode 100644
index a6c86dd..0000000
--- a/recipes/client.rb
+++ /dev/null
@@ -1,32 +0,0 @@
1# encoding: UTF-8
2#
3# Cookbook Name:: openstack-orchestration
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 # rubocop:disable Documentation
22 include ::Openstack
23end
24
25platform_options = node['openstack']['orchestration']['platform']
26platform_options['heat_client_packages'].each do |pkg|
27 package pkg do
28 options platform_options['package_overrides']
29
30 action :upgrade
31 end
32end
diff --git a/recipes/common.rb b/recipes/common.rb
index eae1765..de0920e 100644
--- a/recipes/common.rb
+++ b/recipes/common.rb
@@ -29,11 +29,6 @@ end
29 29
30platform_options = node['openstack']['orchestration']['platform'] 30platform_options = node['openstack']['orchestration']['platform']
31 31
32package 'python-keystoneclient' do
33 options platform_options['package_overrides']
34 action :upgrade
35end
36
37platform_options['heat_common_packages'].each do |pkg| 32platform_options['heat_common_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/spec/api-cfn-redhat_spec.rb b/spec/api-cfn-redhat_spec.rb
index d8fc2e7..3343f4f 100644
--- a/spec/api-cfn-redhat_spec.rb
+++ b/spec/api-cfn-redhat_spec.rb
@@ -11,9 +11,7 @@ describe 'openstack-orchestration::api-cfn' do
11 include_examples 'expect runs openstack orchestration common recipe' 11 include_examples 'expect runs openstack orchestration common recipe'
12 12
13 it 'installs heat cfn packages' do 13 it 'installs heat cfn packages' do
14 ['openstack-heat-api-cfn', 'python-heatclient'].each do |pkg| 14 expect(chef_run).to upgrade_package 'openstack-heat-api-cfn'
15 expect(chef_run).to upgrade_package pkg
16 end
17 end 15 end
18 16
19 it 'starts heat api-cfn on boot' do 17 it 'starts heat api-cfn on boot' do
diff --git a/spec/api-cloudwatch-redhat_spec.rb b/spec/api-cloudwatch-redhat_spec.rb
index 6eaac94..4a1dd80 100644
--- a/spec/api-cloudwatch-redhat_spec.rb
+++ b/spec/api-cloudwatch-redhat_spec.rb
@@ -11,9 +11,7 @@ describe 'openstack-orchestration::api-cloudwatch' do
11 include_examples 'expect runs openstack orchestration common recipe' 11 include_examples 'expect runs openstack orchestration common recipe'
12 12
13 it 'installs heat cloudwatch packages' do 13 it 'installs heat cloudwatch packages' do
14 ['openstack-heat-api-cloudwatch', 'python-heatclient'].each do |pkg| 14 expect(chef_run).to upgrade_package 'openstack-heat-api-cloudwatch'
15 expect(chef_run).to upgrade_package pkg
16 end
17 end 15 end
18 16
19 it 'starts heat api-cloudwatch on boot' do 17 it 'starts heat api-cloudwatch on boot' do
diff --git a/spec/api-redhat_spec.rb b/spec/api-redhat_spec.rb
index c06b472..8688067 100644
--- a/spec/api-redhat_spec.rb
+++ b/spec/api-redhat_spec.rb
@@ -11,9 +11,7 @@ describe 'openstack-orchestration::api' do
11 include_examples 'expect runs openstack orchestration common recipe' 11 include_examples 'expect runs openstack orchestration common recipe'
12 12
13 it 'installs heat api packages' do 13 it 'installs heat api packages' do
14 ['openstack-heat-api', 'python-heatclient'].each do |pkg| 14 expect(chef_run).to upgrade_package 'openstack-heat-api'
15 expect(chef_run).to upgrade_package pkg
16 end
17 end 15 end
18 16
19 it 'starts heat api on boot' do 17 it 'starts heat api on boot' do
diff --git a/spec/client-redhat_spec.rb b/spec/client-redhat_spec.rb
deleted file mode 100644
index 104642b..0000000
--- a/spec/client-redhat_spec.rb
+++ /dev/null
@@ -1,13 +0,0 @@
1# encoding: UTF-8
2require_relative 'spec_helper'
3
4describe 'openstack-orchestration::client' do
5 describe 'redhat' do
6 let(:runner) { ChefSpec::SoloRunner.new(REDHAT_OPTS) }
7 let(:chef_run) { runner.converge(described_recipe) }
8
9 it 'installs packages' do
10 expect(chef_run).to upgrade_package('python-heatclient')
11 end
12 end
13end
diff --git a/spec/client_spec.rb b/spec/client_spec.rb
deleted file mode 100644
index 27b3f5a..0000000
--- a/spec/client_spec.rb
+++ /dev/null
@@ -1,13 +0,0 @@
1# encoding: UTF-8
2require_relative 'spec_helper'
3
4describe 'openstack-orchestration::client' do
5 describe 'ubuntu' do
6 let(:runner) { ChefSpec::SoloRunner.new(UBUNTU_OPTS) }
7 let(:chef_run) { runner.converge(described_recipe) }
8
9 it 'installs packages' do
10 expect(chef_run).to upgrade_package('python-heatclient')
11 end
12 end
13end
diff --git a/spec/common-redhat_spec.rb b/spec/common-redhat_spec.rb
index d2fc8be..3c4913a 100644
--- a/spec/common-redhat_spec.rb
+++ b/spec/common-redhat_spec.rb
@@ -9,7 +9,6 @@ describe 'openstack-orchestration::common' do
9 9
10 include_context 'orchestration_stubs' 10 include_context 'orchestration_stubs'
11 include_examples 'logging' 11 include_examples 'logging'
12 include_examples 'expect installs python keystoneclient'
13 include_examples 'expects to create heat directories' 12 include_examples 'expects to create heat directories'
14 include_examples 'expects to create heat conf' 13 include_examples 'expects to create heat conf'
15 include_examples 'expects to create heat default.yaml' 14 include_examples 'expects to create heat default.yaml'
diff --git a/spec/common_spec.rb b/spec/common_spec.rb
index 928c27d..3fe4efa 100644
--- a/spec/common_spec.rb
+++ b/spec/common_spec.rb
@@ -9,7 +9,6 @@ describe 'openstack-orchestration::common' do
9 9
10 include_context 'orchestration_stubs' 10 include_context 'orchestration_stubs'
11 include_examples 'logging' 11 include_examples 'logging'
12 include_examples 'expect installs python keystoneclient'
13 include_examples 'expects to create heat directories' 12 include_examples 'expects to create heat directories'
14 include_examples 'expects to create heat conf' 13 include_examples 'expects to create heat conf'
15 include_examples 'expects to create heat default.yaml' 14 include_examples 'expects to create heat default.yaml'
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 7933012..3bb2a83 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -14,7 +14,7 @@ REDHAT_OPTS = {
14}.freeze 14}.freeze
15UBUNTU_OPTS = { 15UBUNTU_OPTS = {
16 platform: 'ubuntu', 16 platform: 'ubuntu',
17 version: '14.04', 17 version: '16.04',
18 log_level: ::LOG_LEVEL 18 log_level: ::LOG_LEVEL
19}.freeze 19}.freeze
20SUSE_OPTS = { 20SUSE_OPTS = {
@@ -62,12 +62,6 @@ shared_examples 'expect runs openstack orchestration common recipe' do
62 end 62 end
63end 63end
64 64
65shared_examples 'expect installs python keystoneclient' do
66 it 'installs python-keystoneclient' do
67 expect(chef_run).to upgrade_package 'python-keystoneclient'
68 end
69end
70
71shared_examples 'expect runs openstack common logging recipe' do 65shared_examples 'expect runs openstack common logging recipe' do
72 it 'runs logging recipe if node attributes say to' do 66 it 'runs logging recipe if node attributes say to' do
73 expect(chef_run).to include_recipe 'openstack-common::logging' 67 expect(chef_run).to include_recipe 'openstack-common::logging'