Merge lp:~niedbalski/charms/trusty/ceph/update-sysctl-next 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.

Unmerged revisions

85. By Jorge Niedbalski on 2014-10-07

- Moved this logic to charm-helpers for re-usage on ceph-osd

84. By Jorge Niedbalski on 2014-09-23

Addressed @corey.bryant observations

83. By Jorge Niedbalski on 2014-09-22

- Updated config.yaml to 'associative array'
- Updated hooks.py for not check on (None, "")
- Updated utils.py for docstrings and debug log

82. By Jorge Niedbalski on 2014-09-17

- Added update_sysctl util function for pass sysctl.conf values through juju set
  - Added 'sysctl' config entry into the default config.yaml

=== modified file 'config.yaml'
--- config.yaml	2014-10-06 22:07:41 +0000
+++ config.yaml	2014-10-07 08:46:55 +0000
@@ -138,6 +138,7 @@
       The IP address and netmask of the public (front-side) network (e.g.,
       192.168.0.0/24)
   ceph-cluster-network:
+<<<<<<< TREE
     type: string
     default:
     description: |
@@ -155,3 +156,14 @@
       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.
+=======
+     type: string
+     description: |
+        The IP address and netmask of the cluster (back-side) network (e.g.,
+        192.168.0.0/24)
+  sysctl:
+    type: string
+    default: ""
+    description: |
+      YAML formatted associative array of sysctl values, e.g.:
+      '{ kernel.pid_max : 4194303 }'>>>>>>> MERGE-SOURCE

=== 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-10-07 08:46:55 +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])

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2014-09-30 03:06:10 +0000
+++ hooks/hooks.py	2014-10-07 08:46:55 +0000
@@ -38,6 +38,9 @@
     filter_installed_packages,
     add_source
 )
+
+from charmhelpers.core.sysctl import create as create_sysctl
+
 from charmhelpers.payload.execd import execd_preinstall
 from charmhelpers.contrib.openstack.alternatives import install_alternative
 from charmhelpers.contrib.network.ip import (
@@ -119,6 +122,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')

=== modified file 'hooks/utils.py'
--- hooks/utils.py	2014-09-30 03:06:10 +0000
+++ hooks/utils.py	2014-10-07 08:46:55 +0000
@@ -9,11 +9,18 @@
 
 import socket
 import re
+import yaml
+
+from subprocess import check_call
+
 from charmhelpers.core.hookenv import (
     unit_get,
     cached,
-    config
+    config,
+    log,
+    DEBUG,
 )
+
 from charmhelpers.fetch import (
     apt_install,
     filter_installed_packages
@@ -45,6 +52,27 @@
     import dns.resolver
 
 
+def update_sysctl(sysctl_dict, sysctl_file="/etc/sysctl.d/50-ceph-charm.conf"):
+    """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])
+
+
 def render_template(template_name, context, template_dir=TEMPLATES_DIR):
     templates = jinja2.Environment(
         loader=jinja2.FileSystemLoader(template_dir))