Merge lp:~thedac/charm-helpers/lp1537155 into lp:charm-helpers

[James Page]

[James Page (james-page)]

cpu_count is not supported on earlier versions of psutil.

Unmerged revisions

523. By David Ames on 2016-01-23

Fix Bug#1537155 Use cpu_count() rather than NUM_CPU

=== modified file 'charmhelpers/contrib/openstack/context.py'
--- charmhelpers/contrib/openstack/context.py	2016-01-06 22:04:12 +0000
+++ charmhelpers/contrib/openstack/context.py	2016-01-29 09:13:52 +0000
@@ -1259,12 +1259,12 @@
     @property
     def num_cpus(self):
         try:
-            from psutil import NUM_CPUS
+            from psutil import cpu_count
         except ImportError:
             apt_install('python-psutil', fatal=True)
-            from psutil import NUM_CPUS
+            from psutil import cpu_count
 
-        return NUM_CPUS
+        return cpu_count()
 
     def __call__(self):
         multiplier = config('worker-multiplier') or 0