From 1cccaa0842d77a2be11f378a4c03a574c5caea9d Mon Sep 17 00:00:00 2001
From: Samuel Cassiba <s@cassiba.com>
Date: Tue, 18 Oct 2016 08:56:17 -0700
Subject: [PATCH] Deprecated python-keystoneclient

- deleted client.rb
- deprecated python-keystoneclient references

Implements blueprint newton-xenial

Change-Id: Ia1406308a9c78a0361cd0e2e0844f0e7a3cf4b9f
---
 attributes/default.rb       |  2 --
 attributes/keystone_conf.rb |  1 -
 recipes/client.rb           | 33 ---------------------------------
 spec/client-redhat_spec.rb  | 16 ----------------
 spec/client_spec.rb         | 16 ----------------
 5 files changed, 68 deletions(-)
 delete mode 100644 recipes/client.rb
 delete mode 100644 spec/client-redhat_spec.rb
 delete mode 100644 spec/client_spec.rb

diff --git a/attributes/default.rb b/attributes/default.rb
index d5bcddc..1fbe4d1 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -181,7 +181,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',
@@ -192,7 +191,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',
diff --git a/attributes/keystone_conf.rb b/attributes/keystone_conf.rb
index c35251e..30083c3 100644
--- a/attributes/keystone_conf.rb
+++ b/attributes/keystone_conf.rb
@@ -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'
 
diff --git a/recipes/client.rb b/recipes/client.rb
deleted file mode 100644
index 3370ae7..0000000
--- a/recipes/client.rb
+++ /dev/null
@@ -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
diff --git a/spec/client-redhat_spec.rb b/spec/client-redhat_spec.rb
deleted file mode 100644
index b9eb4e5..0000000
--- a/spec/client-redhat_spec.rb
+++ /dev/null
@@ -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
diff --git a/spec/client_spec.rb b/spec/client_spec.rb
deleted file mode 100644
index 8d81c0f..0000000
--- a/spec/client_spec.rb
+++ /dev/null
@@ -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