From 2ae14f7965f8b1a53cc2d3af2598aec7dd1adb85 Mon Sep 17 00:00:00 2001
From: Mark Vanderwiel <vanderwl@us.ibm.com>
Date: Tue, 11 Aug 2015 11:39:49 -0500
Subject: [PATCH] Update centos/redhat/rdo package names

Update the package names

Change-Id: Ica917bce1932bca9b88b02c5af4bddc6e746acde
Closes-Bug: #1483812
---
 attributes/default.rb              | 10 +++++-----
 spec/api-cfn-redhat_spec.rb        |  6 ++++--
 spec/api-cloudwatch-redhat_spec.rb |  6 ++++--
 spec/api-redhat_spec.rb            |  6 ++++--
 spec/engine-redhat_spec.rb         |  4 ++++
 spec/spec_helper.rb                |  4 ++--
 6 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/attributes/default.rb b/attributes/default.rb
index bdefa69..d3b2ee0 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -206,15 +206,15 @@ when 'fedora', 'rhel' # :pragma-foodcritic: ~FC024 - won't fix this
   default['openstack']['orchestration']['user'] = 'heat'
   default['openstack']['orchestration']['group'] = 'heat'
   default['openstack']['orchestration']['platform'] = {
-    'heat_common_packages' => ['openstack-heat'],
+    'heat_common_packages' => ['openstack-heat-common'],
     'heat_client_packages' => ['python-heatclient'],
-    'heat_api_packages' => ['python-heatclient'],
+    'heat_api_packages' => ['openstack-heat-api', 'python-heatclient'],
     'heat_api_service' => 'openstack-heat-api',
-    'heat_api_cfn_packages' => ['python-heatclient'],
+    'heat_api_cfn_packages' => ['openstack-heat-api-cfn', 'python-heatclient'],
     'heat_api_cfn_service' => 'openstack-heat-api-cfn',
-    'heat_api_cloudwatch_packages' => ['python-heatclient'],
+    'heat_api_cloudwatch_packages' => ['openstack-heat-api-cloudwatch', 'python-heatclient'],
     'heat_api_cloudwatch_service' => 'openstack-heat-api-cloudwatch',
-    'heat_engine_packages' => [],
+    'heat_engine_packages' => ['openstack-heat-engine'],
     'heat_engine_service' => 'openstack-heat-engine',
     'heat_api_process_name' => 'heat-api',
     'package_overrides' => ''
diff --git a/spec/api-cfn-redhat_spec.rb b/spec/api-cfn-redhat_spec.rb
index e62bb48..cf29928 100644
--- a/spec/api-cfn-redhat_spec.rb
+++ b/spec/api-cfn-redhat_spec.rb
@@ -10,8 +10,10 @@ describe 'openstack-orchestration::api-cfn' do
     include_context 'orchestration_stubs'
     include_examples 'expect runs openstack orchestration common recipe'
 
-    it 'installs heat client packages' do
-      expect(chef_run).to upgrade_package 'python-heatclient'
+    it 'installs heat cfn  packages' do
+      ['openstack-heat-api-cfn', 'python-heatclient'].each do |pkg|
+        expect(chef_run).to upgrade_package pkg
+      end
     end
 
     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 61ca06d..6eaac94 100644
--- a/spec/api-cloudwatch-redhat_spec.rb
+++ b/spec/api-cloudwatch-redhat_spec.rb
@@ -10,8 +10,10 @@ describe 'openstack-orchestration::api-cloudwatch' do
     include_context 'orchestration_stubs'
     include_examples 'expect runs openstack orchestration common recipe'
 
-    it 'installs heat client packages' do
-      expect(chef_run).to upgrade_package 'python-heatclient'
+    it 'installs heat cloudwatch packages' do
+      ['openstack-heat-api-cloudwatch', 'python-heatclient'].each do |pkg|
+        expect(chef_run).to upgrade_package pkg
+      end
     end
 
     it 'starts heat api-cloudwatch on boot' do
diff --git a/spec/api-redhat_spec.rb b/spec/api-redhat_spec.rb
index 2fc997a..c06b472 100644
--- a/spec/api-redhat_spec.rb
+++ b/spec/api-redhat_spec.rb
@@ -10,8 +10,10 @@ describe 'openstack-orchestration::api' do
     include_context 'orchestration_stubs'
     include_examples 'expect runs openstack orchestration common recipe'
 
-    it 'installs heat client packages' do
-      expect(chef_run).to upgrade_package 'python-heatclient'
+    it 'installs heat api packages' do
+      ['openstack-heat-api', 'python-heatclient'].each do |pkg|
+        expect(chef_run).to upgrade_package pkg
+      end
     end
 
     it 'starts heat api on boot' do
diff --git a/spec/engine-redhat_spec.rb b/spec/engine-redhat_spec.rb
index 48ceba6..3c1a951 100644
--- a/spec/engine-redhat_spec.rb
+++ b/spec/engine-redhat_spec.rb
@@ -10,6 +10,10 @@ describe 'openstack-orchestration::engine' do
     include_context 'orchestration_stubs'
     include_examples 'expect runs openstack orchestration common recipe'
 
+    it 'installs heat engine package' do
+      expect(chef_run).to upgrade_package 'openstack-heat-engine'
+    end
+
     it 'starts heat engine on boot' do
       expect(chef_run).to enable_service('openstack-heat-engine')
     end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 00fda90..8d62f8c 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -81,8 +81,8 @@ shared_examples 'expect runs openstack common logging recipe' do
 end
 
 shared_examples 'expect installs common heat package' do
-  it 'installs the openstack-heat package' do
-    expect(chef_run).to upgrade_package 'openstack-heat'
+  it 'installs the openstack-heat common package' do
+    expect(chef_run).to upgrade_package 'openstack-heat-common'
   end
 end