openstack/cookbook-openstack-identity
Code Issues Proposed changes

Merge "Deprecated python-keystoneclient"

Browse Source
This commit is contained in:
Jenkins 2016-12-20 11:01:48 +00:00 committed by Gerrit Code Review
commit b9b6b26616
5 changed files with 0 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
attributes/default.rb
View File

@ -178,7 +178,6 @@ when 'fedora', 'rhel' # :pragma-foodcritic: ~FC024 - won't fix this
default['openstack']['identity']['platform'] = {
'memcache_python_packages' => ['python-memcached'],
'keystone_packages' => ['openstack-keystone'],
'keystone_client_packages' => ['python-keystoneclient'],
'keystone_service' => 'openstack-keystone',
'keystone_process_name' => 'keystone-all',
'keystone_wsgi_file' => '/usr/share/keystone/keystone.wsgi',
@ -189,7 +188,6 @@ when 'debian'
default['openstack']['identity']['platform'] = {
'memcache_python_packages' => ['python-memcache'],
'keystone_packages' => ['keystone'],
'keystone_client_packages' => ['python-keystoneclient'],
'keystone_service' => 'keystone',
'keystone_process_name' => 'keystone-all',
'keystone_wsgi_file' => '/usr/share/keystone/wsgi.py',

1
attributes/keystone_conf.rb
View File

@ -15,7 +15,6 @@ default['openstack']['identity']['conf'].tap do |conf|
conf['DEFAULT']['notification_topics'] = 'notifications'
end
conf['DEFAULT']['rpc_backend'] = node['openstack']['mq']['service_type']
# [assignment] option in keystone.conf to set driver
conf['assignment']['driver'] = 'keystone.assignment.backends.sql.Assignment'

33
recipes/client.rb
View File

@ -1,33 +0,0 @@
# encoding: UTF-8
#
# Cookbook Name:: openstack-identity
# Recipe:: client
#
# Copyright 2014, IBM Corp.
#
# 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.
# This recipe installs the packages require to use keystone client.
class ::Chef::Recipe
include ::Openstack
end
platform_options = node['openstack']['identity']['platform']
platform_options['keystone_client_packages'].each do |pkg|
package pkg do
options platform_options['package_overrides']
action :upgrade
end
end

16
spec/client-redhat_spec.rb
View File

@ -1,16 +0,0 @@
# encoding: UTF-8
require_relative 'spec_helper'
describe 'openstack-identity::client' do
describe 'redhat' do
let(:runner) { ChefSpec::SoloRunner.new(REDHAT_OPTS) }
let(:node) { runner.node }
let(:chef_run) do
runner.converge(described_recipe)
end
it 'installs packages' do
expect(chef_run).to upgrade_package('python-keystoneclient')
end
end
end

16
spec/client_spec.rb
View File

@ -1,16 +0,0 @@
# encoding: UTF-8
require_relative 'spec_helper'
describe 'openstack-identity::client' do
describe 'ubuntu' do
let(:runner) { ChefSpec::SoloRunner.new(UBUNTU_OPTS) }
let(:node) { runner.node }
let(:chef_run) do
runner.converge(described_recipe)
end
it 'installs packages' do
expect(chef_run).to upgrade_package('python-keystoneclient')
end
end
end