Merge lp:~gnuoy/charms/trusty/nova-compute/no-hugepages into lp:~openstack-charmers-archive/charms/trusty/nova-compute/next

[Liam Young]

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #14751 nova-compute-next for gnuoy mp279245
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/14751/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #13754 nova-compute-next for gnuoy mp279245
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/13754/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #8071 nova-compute-next for gnuoy mp279245
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 124
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/13621993/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8071/

[David Ames (thedac)]

LGTM, merging

review: Approve

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #8075 nova-compute-next for gnuoy mp279245
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/8075/

=== modified file 'hooks/nova_compute_utils.py'
--- hooks/nova_compute_utils.py	2015-11-25 12:48:50 +0000
+++ hooks/nova_compute_utils.py	2015-12-02 09:56:26 +0000
@@ -807,14 +807,16 @@
     #       and support multiple pool sizes - e.g. 2M and 1G.
     hugepage_size = 2048
     hugepage_config = config('hugepages')
-    if hugepage_config.endswith('%'):
-        import psutil
-        mem = psutil.virtual_memory()
-        hugepage_config_pct = hugepage_config.strip('%')
-        hugepage_multiplier = float(hugepage_config_pct) / 100
-        hugepages = int((mem.total * hugepage_multiplier) / hugepage_size)
-    else:
-        hugepages = int(hugepage_config)
+    hugepages = None
+    if hugepage_config:
+        if hugepage_config.endswith('%'):
+            import psutil
+            mem = psutil.virtual_memory()
+            hugepage_config_pct = hugepage_config.strip('%')
+            hugepage_multiplier = float(hugepage_config_pct) / 100
+            hugepages = int((mem.total * hugepage_multiplier) / hugepage_size)
+        else:
+            hugepages = int(hugepage_config)
     return hugepages