From ef19c5584da92084c0c804392d6e0c3ac92c2ab9 Mon Sep 17 00:00:00 2001
From: Crag Wolfe <cwolfe@redhat.com>
Date: Wed, 3 Jun 2015 18:53:09 -0400
Subject: [PATCH] The package python-ceph no longer exists in el7, use
 python-rbd.

Change-Id: I885a11fd33577618138ddffaf0de196e7bb62a77
---
 manifests/params.pp                     |  7 ++++++-
 spec/classes/glance_backend_rbd_spec.rb | 27 +++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 61df5b8d..6fbed16a 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -3,7 +3,6 @@
 class glance::params {
 
   $client_package_name = 'python-glanceclient'
-  $pyceph_package_name = 'python-ceph'
 
   $cache_cleaner_command = 'glance-cache-cleaner'
   $cache_pruner_command  = 'glance-cache-pruner'
@@ -15,6 +14,11 @@ class glance::params {
       $api_service_name      = 'openstack-glance-api'
       $registry_service_name = 'openstack-glance-registry'
       $db_sync_command       = 'glance-manage --config-file=/etc/glance/glance-registry.conf db_sync'
+      if ($::operatingsystem != 'fedora' and versioncmp($::operatingsystemrelease, '7') < 0) {
+        $pyceph_package_name = 'python-ceph'
+      } else {
+        $pyceph_package_name = 'python-rbd'
+      }
     }
     'Debian': {
       $api_package_name      = 'glance-api'
@@ -22,6 +26,7 @@ class glance::params {
       $api_service_name      = 'glance-api'
       $registry_service_name = 'glance-registry'
       $db_sync_command       = 'glance-manage --config-file=/etc/glance/glance-registry.conf db_sync'
+      $pyceph_package_name   = 'python-ceph'
     }
     default: {
       fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, module ${module_name} only support osfamily RedHat and Debian")
diff --git a/spec/classes/glance_backend_rbd_spec.rb b/spec/classes/glance_backend_rbd_spec.rb
index 4ca1c18d..0de3daf6 100644
--- a/spec/classes/glance_backend_rbd_spec.rb
+++ b/spec/classes/glance_backend_rbd_spec.rb
@@ -42,4 +42,31 @@ describe 'glance::backend::rbd' do
       )
     }
   end
+
+  describe 'package on RedHat platform el6' do
+    let :facts do
+      {
+        :osfamily               => 'RedHat',
+        :operatingsystemrelease => '6.5',
+      }
+    end
+    it { is_expected.to contain_package('python-ceph').with(
+        :name   => 'python-ceph',
+        :ensure => 'present'
+      )
+    }
+  end
+  describe 'package on RedHat platform el7' do
+    let :facts do
+      {
+        :osfamily               => 'RedHat',
+        :operatingsystemrelease => '7.0'
+      }
+    end
+    it { is_expected.to contain_package('python-ceph').with(
+        :name   => 'python-rbd',
+        :ensure => 'present'
+      )
+    }
+  end
 end