--- a/components/ruby/puppet-modules/openstack-openstacklib/patches/02-openstackclient.patch	Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-openstacklib/patches/02-openstackclient.patch	Wed Sep 07 14:48:35 2016 -0700
@@ -12,24 +12,14 @@
  # == Class: openstacklib::openstackclient
  #
  # Installs the openstackclient
-@@ -10,9 +14,16 @@
- #
+@@ -11,5 +15,9 @@
  class openstacklib::openstackclient(
    $package_ensure = 'present',
--){
--  package { 'python-openstackclient':
--    ensure => $package_ensure,
--    tag    => 'openstack',
-+) {
+ ){
+-  ensure_packages('python-openstackclient', {'ensure' => $package_ensure, tag => 'openstack'})
 +  if $::osfamily == 'Solaris' {
-+    package { 'library/python/openstackclient':
-+      ensure => $package_ensure,
-+      tag    => 'openstack',
-+    }
++    ensure_packages('library/python/openstackclient', {'ensure' => $package_ensure, tag => 'openstack'})
 +  } else {
-+    package { 'python-openstackclient':
-+      ensure => $package_ensure,
-+      tag    => 'openstack',
-+    }
-   }
++    ensure_packages('python-openstackclient', {'ensure' => $package_ensure, tag => 'openstack'})
++  }
  }