← Back to branch summary

~james-page/charms/trusty/cinder/lp1531102-trunk

« back to all changes in this revision

Viewing changes to hooks/charmhelpers/core/hugepage.py

  • Committer: James Page
  • Date: 2016-01-07 14:13:23 UTC
  • Revision ID: james.page@ubuntu.com-20160107141323-vh619kqojsjh7i0r
https://launchpad.net/bugs/1531102
Resync charm-helpers

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/charmhelpers/core/hugepage.py
46
46
    group_info = add_group(group)
47
47
    gid = group_info.gr_gid
48
48
    add_user_to_group(user, group)
 
49
    if max_map_count < 2 * nr_hugepages:
 
50
        max_map_count = 2 * nr_hugepages
49
51
    sysctl_settings = {
50
52
        'vm.nr_hugepages': nr_hugepages,
51
53
        'vm.max_map_count': max_map_count,