Merge ~vultaire/charm-juju-lxd:limit-fixes into ~afreiberger/charm-juju-lxd:init_with_dir_storage

[Paul Goins]

fe1eab5... by Paul Goins on 2019-07-30

Minor fix

[Drew Freiberger (afreiberger)]

I'd like to see these added as templatable files with associated configs.

Let's at least start by making them files installed through charmhelpers.core.templating.render() and we can work on the config/jinja context bits in the future.

review: Needs Fixing

[Paul Goins (vultaire)]

Sounds good; will do.

Unmerged commits

fe1eab5... by Paul Goins on 2019-07-30

Minor fix

c6a37b8... by Paul Goins on 2019-07-29

Adding config for LXD production setup

diff --git a/reactive/juju_lxd.py b/reactive/juju_lxd.py
index 25177e5..7b4d2d9 100644
--- a/reactive/juju_lxd.py
+++ b/reactive/juju_lxd.py
@@ -30,6 +30,7 @@ import grp
 def install_charm_juju_lxd():
     git_repo()
     lxd_init()
+    limits_config()
     status_set("active", "Ready")
     set_state('juju-lxd.installed')
 
@@ -114,6 +115,41 @@ def lxd_init():
             pass
 
 
+def limits_config():
+    # These settings should be equivalent to those documented here:
+    # https://github.com/lxc/lxd/blob/master/doc/production-setup.md
+    # If not, please update.
+    with open('/etc/security/limits.d/50-juju-lxd.conf', 'w') as outfile:
+        outfile.write("""\
+* soft nofile 1048576
+* hard nofile 1048576
+root soft nofile 1048576
+root hard nofile 1048576
+* soft memlock unlimited
+* hard memlock unlimited
+""")
+    with open('/etc/sysctl.d/50-juju-lxd.conf', 'w') as outfile:
+        outfile.write("""\
+fs.inotify.max_queued_events=1048576
+vm.max_map_count=262144
+kernel.dmesg_restrict=1
+net.ipv4.neigh.default.gc_thresh3=8192
+net.ipv6.neigh.default.gc_thresh3=8192
+kernel.keys.maxkeys=2000
+
+# Skipping max_user_(instances|watches) here due to https://bugs.launchpad.net/juju/+bug/1817774.
+# Set via /usr/lib/sysctl.d/z50-juju-lxd.conf instead.
+""")
+    with open('/usr/lib/sysctl.d/z50-juju-lxd.conf', 'w') as outfile:
+        outfile.write("""\
+# These get overridden via /usr/lib/sysctl.d/juju-2.conf; re-setting them here.
+# (https://bugs.launchpad.net/juju/+bug/1817774)
+fs.inotify.max_user_instances = 1048576
+fs.inotify.max_user_watches = 1048576
+""")
+    subprocess.call(['systemctl', 'restart', 'systemd-sysctl'])
+
+
 def git_repo():
     subprocess.call(['git', 'clone',
                      'https://github.com/openstack-charmers/openstack-on-lxd'])