Heat services need keystoneclient not keystone

The common recipe has been pulling in the entire
python-keystone package, which is the entire Keystone
set of services. This hasn't been necessary since
some time after Grizzly, when the tokenauth middleware
was moved to the client.

Change-Id: Ifb133d570e2ad94df822aa512edeb37aabdf349b
Related-Bug: #1305318

CHANGELOG.md

@@ -1,6 +1,9 @@
 # CHANGELOG for cookbook-openstack-orchestration
 
 This file is used to list changes made in each version of cookbook-openstack-orchestration
+## 9.1.3
+* Fix package reference, need keystone client not keystone
+
 ## 9.1.2
 * Fix endpoint ref in heat conf
 

metadata.rb

@@ -4,7 +4,7 @@ maintainer        'IBM, Inc.'
 license           'Apache 2.0'
 description       'Installs and configures the Heat Service'
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version           '9.1.2'
+version           '9.1.3'
 recipe            'openstack-orchestration::api', 'Start and configure the Heat API service'
 recipe            'openstack-orchestration::api-cfn', 'Start and configure the Heat API CloudFormation service'
 recipe            'openstack-orchestration::api-cloudwatch', 'Start and configure the Heat API CloudWatch service'

recipes/common.rb

@@ -26,12 +26,13 @@ if node['openstack']['orchestration']['syslog']['use']
   include_recipe 'openstack-common::logging'
 end
 
-package 'python-keystone' do
+platform_options = node['openstack']['orchestration']['platform']
+
+package 'python-keystoneclient' do
+  options platform_options['package_overrides']
   action :upgrade
 end
 
-platform_options = node['openstack']['orchestration']['platform']
-
 platform_options['heat_common_packages'].each do |pkg|
   package pkg do
     options platform_options['package_overrides']

spec/api-cfn-redhat_spec.rb

@@ -12,8 +12,8 @@ describe 'openstack-orchestration::api-cfn' do
     end
 
     expect_runs_openstack_orchestration_common_recipe
-
     expect_runs_openstack_common_logging_recipe
+    expect_installs_python_keystoneclient
 
     it 'installs heat client packages' do
       expect(@chef_run).to upgrade_package 'python-heatclient'

spec/api-cloudwatch-redhat_spec.rb

@@ -12,8 +12,8 @@ describe 'openstack-orchestration::api-cloudwatch' do
     end
 
     expect_runs_openstack_orchestration_common_recipe
-
     expect_runs_openstack_common_logging_recipe
+    expect_installs_python_keystoneclient
 
     it 'installs heat client packages' do
       expect(@chef_run).to upgrade_package 'python-heatclient'

spec/api-redhat_spec.rb

@@ -10,6 +10,7 @@ describe 'openstack-orchestration::api' do
     end
 
     expect_runs_openstack_orchestration_common_recipe
+    expect_installs_python_keystoneclient
 
     it 'does not run logging recipe' do
       expect(@chef_run).not_to include_recipe 'openstack-common::logging'

spec/common-redhat_spec.rb

@@ -8,9 +8,7 @@ describe 'openstack-orchestration::common' do
     @chef_run.converge 'openstack-orchestration::common'
   end
 
-  it 'installs python-keystone' do
-    expect(@chef_run).to upgrade_package 'python-keystone'
-  end
+  expect_installs_python_keystoneclient
 
   it 'installs the openstack-heat package' do
     expect(@chef_run).to upgrade_package 'openstack-heat'

spec/common_spec.rb

@@ -8,9 +8,7 @@ describe 'openstack-orchestration::common' do
     @chef_run.converge 'openstack-orchestration::common'
   end
 
-  it 'installs python-keystone' do
-    expect(@chef_run).to upgrade_package 'python-keystone'
-  end
+  expect_installs_python_keystoneclient
 
   it 'installs the openstack-heat package' do
     expect(@chef_run).to upgrade_package 'heat-common'

spec/engine-redhat_spec.rb

@@ -10,6 +10,7 @@ describe 'openstack-orchestration::engine' do
     end
 
     expect_runs_openstack_orchestration_common_recipe
+    expect_installs_python_keystoneclient
 
     it 'does not run logging recipe' do
       expect(@chef_run).not_to include_recipe 'openstack-common::logging'

spec/spec_helper.rb

@@ -50,9 +50,9 @@ def expect_runs_openstack_orchestration_common_recipe
   end
 end
 
-def expect_installs_python_keystone
-  it 'installs python-keystone' do
-    expect(@chef_run).to upgrade_package 'python-keystone'
+def expect_installs_python_keystoneclient
+  it 'installs python-keystoneclient' do
+    expect(@chef_run).to upgrade_package 'python-keystoneclient'
   end
 end