From d8c9d05ec82953ccebe51d75c869d1afde3f5769 Mon Sep 17 00:00:00 2001
From: Dan Bode <dan@puppetlabs.com>
Date: Tue, 24 Apr 2012 22:47:01 -0700
Subject: [PATCH] Specify platform specific names for numpy package

The numpy package is named differently between Redhatish
and Debianish systems.

This commit adds the data differences.
---
 manifests/params.pp                 |  2 ++
 manifests/vncproxy.pp               |  3 +++
 spec/classes/nova_vnc_proxy_spec.rb | 19 ++++++++++++++++++-
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 0aea5379..67adb47b 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -13,6 +13,7 @@
       $doc_package_name         = 'openstack-nova-doc'
       $libvirt_package_name     = 'libvirt'
       $network_package_name     = false
+      $numpy_package_name       = 'numpy'
       $objectstore_package_name = false
       $scheduler_package_name   = false
       $tgt_package_name         = 'scsi-target-utils'
@@ -45,6 +46,7 @@
       $doc_package_name         = 'nova-doc'
       $libvirt_package_name     = 'libvirt-bin'
       $network_package_name     = 'nova-network'
+      $numpy_package_name       = 'python-numpy'
       $objectstore_package_name = 'nova-objectstore'
       $scheduler_package_name   = 'nova-scheduler'
       $tgt_package_name         = 'tgt'
diff --git a/manifests/vncproxy.pp b/manifests/vncproxy.pp
index 6488ed9a..179bfcbd 100644
--- a/manifests/vncproxy.pp
+++ b/manifests/vncproxy.pp
@@ -6,6 +6,8 @@
   $path      = '/vnc_auto.html'
 ) {
 
+  include nova::params
+
   $novncproxy_base_url = "${protocol}://${host}:${port}${path}"
 
   # TODO make this work on Fedora
@@ -15,6 +17,7 @@
   nova_config { 'novncproxy_base_url': value => $novncproxy_base_url }
 
   package { 'python-numpy':
+    name   => $::nova::params::numpy_package_name,
     ensure => present,
   }
 
diff --git a/spec/classes/nova_vnc_proxy_spec.rb b/spec/classes/nova_vnc_proxy_spec.rb
index 59e3c8f8..1e7b3126 100644
--- a/spec/classes/nova_vnc_proxy_spec.rb
+++ b/spec/classes/nova_vnc_proxy_spec.rb
@@ -11,7 +11,10 @@
       { :osfamily => 'Debian' }
     end
 
-    it { should contain_package('python-numpy').with_ensure('present') }
+    it { should contain_package('python-numpy').with(
+      :ensure => 'present',
+      :name   => 'python-numpy'
+    )}
 
     it { should contain_nova_config('novncproxy_base_url').with(
       :value => 'http://127.0.0.1:6080/vnc_auto.html'
@@ -26,4 +29,18 @@
     #  )}
     #end
   end
+
+  describe 'on Redhatish platforms' do
+
+    let :facts do
+      { :osfamily => 'Redhat' }
+    end
+
+    it { should contain_package('python-numpy').with(
+      :name   => 'numpy',
+      :ensure => 'present'
+    )}
+
+  end
+
 end