Merge lp:~jillrouleau/charms/trusty/swift-storage/sysctl-handling into lp:~openstack-charmers-archive/charms/trusty/swift-storage/trunk

[Jill Rouleau]

Adding ability to set a sysctl.d file for extra parameters swift often needs, such as ip_conntrack_max.

Adding ability to set a sysctl.d file for extra parameters swift often needs, such as ip_conntrack_max. Work in progress - generating MP for collaboration review.

[JuanJo Ciarlante (jjo)]

Some 1st pass comments.

[lp:~jillrouleau/charms/trusty/swift-storage/sysctl-handling]

53. By Jill Rouleau on 2014-11-07

Trying to loop thru dict to grab values per feedback lp/~jillrouleau/charms/trusty/swift-storage/sysctl-handling/+merge/240927

Unmerged revisions

53. By Jill Rouleau on 2014-11-07

Trying to loop thru dict to grab values per feedback lp/~jillrouleau/charms/trusty/swift-storage/sysctl-handling/+merge/240927

52. By Jill Rouleau on 2014-11-05

Adding yaml options back in, adding addt'l handling

51. By Jill Rouleau on 2014-10-30

Removing extraneous yaml, will be handled in deploy yaml

50. By Jill Rouleau on 2014-10-30

Implementing sysctl handling via charmhelpers, adding sysctl.py to bundled charmhelpers

49. By Jill Rouleau on 2014-10-30

Add options for creating systcl.d file 20-swift-storage.conf

=== modified file 'config.yaml'
--- config.yaml	2014-10-06 21:45:39 +0000
+++ config.yaml	2014-11-07 21:17:08 +0000
@@ -95,3 +95,15 @@
     type: int
     description: |
       Number of replication workers to spawn.
+  sysctl_dict:
+    default: {}
+    type: dict
+    description:
+      YAML-formatted list of sysctl values, e.g.:
+      '{ net.ipv4.tcp_max_syn_backlog : 65536 }'
+  sysctl_file:
+    default: "/etc/sysctl.d/20-swift-storage.conf"
+    type: string
+    description:
+      Location of sysctl.d configuration file
+

=== 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-07 21:17:08 +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])
\ No newline at end of file

=== modified file 'hooks/swift_storage_hooks.py'
--- hooks/swift_storage_hooks.py	2014-10-07 08:37:20 +0000
+++ hooks/swift_storage_hooks.py	2014-11-07 21:17:08 +0000
@@ -40,6 +40,8 @@
     get_ipv6_addr
 )
 
+from charmhelpers.core.sysctl import create as sysctl_create
+
 hooks = Hooks()
 CONFIGS = register_configs()
 
@@ -65,6 +67,13 @@
     CONFIGS.write_all()
     save_script_rc()
 
+    try:
+        config.get('sysctl_dict', 'sysctl_file')
+        for key, value in sysctl_dict.iteritems():
+            sysctl_create()
+    except NameError:
+        pass
+
 
 @hooks.hook('upgrade-charm')
 def upgrade_charm():