diff --git a/packstack/puppet/modules/packstack/manifests/ceilometer.pp b/packstack/puppet/modules/packstack/manifests/ceilometer.pp
index 1601dd5cf..bd41c42f8 100644
--- a/packstack/puppet/modules/packstack/manifests/ceilometer.pp
+++ b/packstack/puppet/modules/packstack/manifests/ceilometer.pp
@@ -6,13 +6,20 @@ class packstack::ceilometer ()
 
     $config_gnocchi_host = hiera('CONFIG_KEYSTONE_HOST_URL')
 
+    if ($::operatingsystem == 'Fedora') or
+       ($::osfamily == 'RedHat' and Integer.new($::operatingsystemmajrelease) > 7) {
+      $pyvers = '3'
+    } else {
+      $pyvers = ''
+    }
+
     if $config_ceilometer_coordination_backend == 'redis' {
       $redis_host = hiera('CONFIG_REDIS_HOST_URL')
       $redis_port = hiera('CONFIG_REDIS_PORT')
       $coordination_url = "redis://${redis_host}:${redis_port}"
 
-      ensure_resource('package', 'python-redis', {
-        name   => 'python-redis',
+      ensure_resource('package', "python${pyvers}-redis", {
+        name   => "python${pyvers}-redis",
         tag    => 'openstack',
       })
     } else {
diff --git a/packstack/puppet/modules/packstack/manifests/nova/compute.pp b/packstack/puppet/modules/packstack/manifests/nova/compute.pp
index d04581c29..c83407647 100644
--- a/packstack/puppet/modules/packstack/manifests/nova/compute.pp
+++ b/packstack/puppet/modules/packstack/manifests/nova/compute.pp
@@ -5,8 +5,8 @@ class packstack::nova::compute ()
     create_resources(packstack::firewall, hiera($qemu_rule_name, {}))
     create_resources(packstack::firewall, hiera('FIREWALL_NOVA_COMPUTE_RULES', {}))
 
-    ensure_packages(['python-cinderclient'], {'ensure' => 'present'})
-    Package['python-cinderclient'] -> Class['nova']
+    ensure_packages(['/usr/bin/cinder'], {'ensure' => 'present'})
+    Package['/usr/bin/cinder'] -> Class['nova']
 
     # Install the private key to be used for live migration.  This needs to be
     # configured into libvirt/live_migration_uri in nova.conf.
diff --git a/packstack/puppet/modules/packstack/manifests/openstackclient.pp b/packstack/puppet/modules/packstack/manifests/openstackclient.pp
index e9e3a8e4d..3cb994c88 100644
--- a/packstack/puppet/modules/packstack/manifests/openstackclient.pp
+++ b/packstack/puppet/modules/packstack/manifests/openstackclient.pp
@@ -1,13 +1,13 @@
 class packstack::openstackclient ()
 {
-    $clientlibs = ['python-novaclient',
-      'python-glanceclient',
-      'python-cinderclient', 'python-openstackclient']
+    $clientlibs = ['/usr/bin/nova',
+      '/usr/bin/glance',
+      '/usr/bin/cinder', '/usr/bin/openstack']
 
     ensure_packages($clientlibs, {'ensure' => 'present'})
 
     if hiera('CONFIG_MANILA_INSTALL') == 'y' {
-      ensure_packages(['python-manilaclient'], {'ensure' => 'present'})
+      ensure_packages(['/usr/bin/manila'], {'ensure' => 'present'})
     }
 
     $ost_cl_keystone_admin_username = hiera('CONFIG_KEYSTONE_ADMIN_USERNAME')