From fe81a383826df5b806ffe8ca8414734e11a94d34 Mon Sep 17 00:00:00 2001
From: Liam Young <liam.young@canonical.com>
Date: Wed, 4 Jan 2017 07:49:06 +0000
Subject: [PATCH] Update/add templates for deploying Memcache

Add template for memcache config and amend keystone auth token
config fragment to point at memcache server if one is available

Add metadata.yaml to satisfy charm proof

Change-Id: I2c50fcb261e70648f5985c9e927ff58741877470
---
 metadata.yaml                              |  7 +++
 templates/memcached.conf                   | 53 ++++++++++++++++++++++
 templates/parts/section-keystone-authtoken |  3 ++
 3 files changed, 63 insertions(+)
 create mode 100644 metadata.yaml
 create mode 100644 templates/memcached.conf

diff --git a/metadata.yaml b/metadata.yaml
new file mode 100644
index 0000000..0441576
--- /dev/null
+++ b/metadata.yaml
@@ -0,0 +1,7 @@
+name: layer-openstack
+summary: OpenStack Base Layer
+maintainer: OpenStack Charmers <openstack-charmers@lists.ubuntu.com>
+description: |
+ The Base Layer for OpenStack reactive charms
+tags:
+  - openstack
diff --git a/templates/memcached.conf b/templates/memcached.conf
new file mode 100644
index 0000000..568d257
--- /dev/null
+++ b/templates/memcached.conf
@@ -0,0 +1,53 @@
+###############################################################################
+# [ WARNING ]
+# memcached configuration file maintained by Juju
+# local changes may be overwritten.
+###############################################################################
+
+# memcached default config file
+# 2003 - Jay Bonci <jaybonci@debian.org>
+# This configuration file is read by the start-memcached script provided as
+# part of the Debian GNU/Linux distribution.
+
+# Run memcached as a daemon. This command is implied, and is not needed for the
+# daemon to run. See the README.Debian that comes with this package for more
+# information.
+-d
+
+# Log memcached's output to /var/log/memcached
+logfile /var/log/memcached.log
+
+# Be verbose
+# -v
+
+# Be even more verbose (print client commands as well)
+# -vv
+
+# Start with a cap of 64 megs of memory. It's reasonable, and the daemon default
+# Note that the daemon will grow to this size, but does not start out holding this much
+# memory
+-m 64
+
+# Default connection port is 11211
+-p {{ options.memcache_port }}
+
+# Run the daemon as root. The start-memcached will default to running as root if no
+# -u command is present in this config file
+-u memcache
+
+# Specify which IP address to listen on. The default is to listen on all IP addresses
+# This parameter is one of the only security measures that memcached has, so make sure
+# it's listening on a firewalled interface.
+-l {{ options.memcache_server }}
+
+# Limit the number of simultaneous incoming connections. The daemon default is 1024
+# -c 1024
+
+# Lock down all paged memory. Consult with the README and homepage before you do this
+# -k
+
+# Return error when memory is exhausted (rather than removing items)
+# -M
+
+# Maximize core file limit
+# -r
diff --git a/templates/parts/section-keystone-authtoken b/templates/parts/section-keystone-authtoken
index c48a951..40354c6 100644
--- a/templates/parts/section-keystone-authtoken
+++ b/templates/parts/section-keystone-authtoken
@@ -11,4 +11,7 @@ password = {{ identity_service.service_password }}
 {% if identity_service.signing_dir -%}
 signing_dir = {{ identity_service.signing_dir }}
 {% endif -%}
+{% if options.use_memcache == true -%}
+memcached_servers = {{ options.memcache_url }}
+{% endif -%}
 {% endif -%}