Merge lp:~niedbalski/charms/trusty/ceph/sysctl-update into lp:~openstack-charmers-archive/charms/trusty/ceph/next

[Jorge Niedbalski]

- Added a sysctl configuration option for passing ceph specific
runtime flags.
       - Modified config.yaml to expose this option, by default is ""
       - Modified utils.py to add the update_sysctl function

[Edward Hope-Morley (hopem)]

Few nits inline, othwerwise looks ok.

review: Needs Fixing

[Corey Bryant (corey.bryant)]

Tested and works good for me. I do have a few comments inline though.

review: Needs Fixing

[Corey Bryant (corey.bryant)]

2 more nits from my end. After that I'll approve.

[Corey Bryant (corey.bryant)]

review: Needs Fixing

[Corey Bryant (corey.bryant)]

review: Approve

[Edward Hope-Morley (hopem)]

LGTM

review: Approve

[Edward Hope-Morley (hopem)]

@niedbalski this patch will also need to land in the ceph osd charm. Ceph hosts that acting as scale-out for OSDs will not necessarily have the ceph charm installed. The update_sysctl() function should therefore go to charm-helpers.

[Jorge Niedbalski (niedbalski)]

Linked branch for ceph-osd https://code.launchpad.net/~niedbalski/charms/trusty/ceph-osd/sysctl-param/+merge/237381

[Corey Bryant (corey.bryant)]

Hey Jorge, Looks good and is basically the same code I tested prior to the shift to charm-helpers.

review: Approve

[Jorge Niedbalski (niedbalski)]

> Hey Jorge, Looks good and is basically the same code I tested prior to the
> shift to charm-helpers.

Thanks Corey. Could you also review https://code.launchpad.net/~niedbalski/charms/trusty/ceph-osd/sysctl-param/+merge/237381 ?

[Corey Bryant (corey.bryant)]

> > Hey Jorge, Looks good and is basically the same code I tested prior to the
> > shift to charm-helpers.
>
> Thanks Corey. Could you also review
> https://code.launchpad.net/~niedbalski/charms/trusty/ceph-osd/sysctl-
> param/+merge/237381 ?

No problem Jorge. Done.

[James Page (james-page)]

See comments re sane default in ceph-osd review - can we do something better than providing a tuning knob?

[Jorge Niedbalski (niedbalski)]

Hello @jamespage

Any chance to get this merged?

[lp:~niedbalski/charms/trusty/ceph/sysctl-update]

87. By Jorge Niedbalski on 2014-11-20

[config] removed empty string from sysctl config param

88. By Jorge Niedbalski on 2014-11-25

[all] sync charmhelpers

89. By Jorge Niedbalski on 2014-11-25

[all] sync charmhelpers

Unmerged revisions

=== modified file 'config.yaml'
--- config.yaml	2014-10-06 22:07:41 +0000
+++ config.yaml	2014-11-20 21:25:15 +0000
@@ -154,4 +154,10 @@
       NOTE: these charms do not currently support IPv6 privacy extension. In
       order for this charm to function correctly, the privacy extension must be
       disabled and a non-temporary address must be configured/available on
-      your network interface.
+      your network interface.	
+  sysctl:
+    type: string
+    default:
+    description: |
+      YAML formatted associative array of sysctl values, e.g.:
+      '{ kernel.pid_max : 4194303 }'

=== added file 'hooks/charmhelpers/core/sysctl.py'
--- hooks/charmhelpers/core/sysctl.py	1970-01-01 00:00:00 +0000
+++ hooks/charmhelpers/core/sysctl.py	2014-11-20 21:25:15 +0000
@@ -0,0 +1,34 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+__author__ = 'Jorge Niedbalski R. <[e-mail]>'
+
+import yaml
+
+from subprocess import check_call
+
+from charmhelpers.core.hookenv import (
+    log,
+    DEBUG,
+)
+
+
+def create(sysctl_dict, sysctl_file):
+    """Creates a sysctl.conf file from a YAML associative array
+
+    :param sysctl_dict: a dict of sysctl options eg { 'kernel.max_pid': 1337 }
+    :type sysctl_dict: dict
+    :param sysctl_file: path to the sysctl file to be saved
+    :type sysctl_file: str or unicode
+    :returns: None
+    """
+    sysctl_dict = yaml.load(sysctl_dict)
+
+    with open(sysctl_file, "w") as fd:
+        for key, value in sysctl_dict.items():
+            fd.write("{}={}\n".format(key, value))
+
+    log("Updating sysctl_file: %s values: %s" % (sysctl_file, sysctl_dict),
+        level=DEBUG)
+
+    check_call(["sysctl", "-p", sysctl_file])

=== renamed file 'hooks/charmhelpers/core/sysctl.py' => 'hooks/charmhelpers/core/sysctl.py.moved'
=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2014-11-19 21:33:12 +0000
+++ hooks/hooks.py	2014-11-20 21:25:15 +0000
@@ -45,6 +45,12 @@
     get_ipv6_addr,
     format_ipv6_addr
 )
+<<<<<<< TREE
+=======
+
+from charmhelpers.core.sysctl import create as create_sysctl
+
+>>>>>>> MERGE-SOURCE
 from utils import (
     render_template,
     get_public_addr,
@@ -122,6 +128,10 @@
         log('Invalid OSD disk format configuration specified', level=ERROR)
         sys.exit(1)
 
+    sysctl_dict = config('sysctl')
+    if sysctl_dict:
+        create_sysctl(sysctl_dict, '/etc/sysctl.d/50-ceph-charm.conf')
+
     emit_cephconf()
 
     e_mountpoint = config('ephemeral-unmount')