Merge lp:~sdn-charmers/charms/trusty/openstack-dashboard/add-settings into lp:~openstack-charmers-archive/charms/trusty/openstack-dashboard/next

[Michał Sawicz]

[saviq] Add facilities for a container-scoped relation to affect dashboard settings

NOTE: this includes lp:~saviq/charm-helpers/glob-restart and lp:~saviq/charm-helpers/confg-patterns

This is a first, naive try at making the dashboard charm support a subordinate charm to modify the dashboard settings. Its purpose is to allow adding dashboard plugins and such as subordinate charms.

The first charm using this:

lp:~sdn-charmers/charms/trusty/horizon-contrail/trunk/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #4847 openstack-dashboard-next for saviq mp260461
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/11410405/
Build: http://10.245.162.77:8080/job/charm_lint_check/4847/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #4527 openstack-dashboard-next for saviq mp260461
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/4527/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #4338 openstack-dashboard-next for saviq mp260461
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/11410924/
Build: http://10.245.162.77:8080/job/charm_amulet_test/4338/

[Corey Bryant (corey.bryant)]

I'm wondering if we can limit subordinate charms to only updating pluggable settings by adding *.py files to openstack_dashboard/local/enabled as described here:
http://docs.openstack.org/developer/horizon/topics/settings.html#pluggable-settings-label

If we don't allow subordinates to change default settings in local_settings.py, we should be able to at least avoid some conflicts in the case where multiple subordinate charms are deployed.

There still seems to be opportunity for conflicts and precedence issues if multiple subordinates are deployed and I'm not sure the best way to avoid those other than some general guidance in the openstack-dashboard README to help developers of subordinate plugins best avoid conflicts.

[Corey Bryant (corey.bryant)]

There's one comment inline below too.

[Michał Sawicz (saviq)]

Indeed, after thinking a bit more, I could model the relation after the pluggable setting mechanism, even be smart and "backport" some of those to previous releases.

As for conflicts and ordering, I can expose the precedence so that you can set it per-subordinate, and warn about conflicts in the logs, that's the best we can do I think.

[Corey Bryant (corey.bryant)]

> Indeed, after thinking a bit more, I could model the relation after the
> pluggable setting mechanism, even be smart and "backport" some of those to
> previous releases.
>
> As for conflicts and ordering, I can expose the precedence so that you can set
> it per-subordinate, and warn about conflicts in the logs, that's the best we
> can do I think.

Yes, a precedence option makes sense. Perhaps that could be a number that ends up being used in the *.py file name. e.g. _##_pluggable_xyz.py

[Corey Bryant (corey.bryant)]

Responded to inline comment

[Michał Sawicz (saviq)]

> Yes, a precedence option makes sense. Perhaps that could be a number
> that ends up being used in the *.py file name. e.g. _##_pluggable_xyz.py

Yup, that was exactly my plan.

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #4342 openstack-dashboard-next for saviq mp260461
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/11438028/
Build: http://10.245.162.77:8080/job/charm_amulet_test/4342/

[Michał Sawicz (saviq)]

I've added support for file-based plugins and priority. I'm no longer sure we should try and interpret what the subordinate charm wants... ultimately those are just python files, we'd need to add bits like 'imports' to the relation data, and likely free-form 'additional_stanzas' or so to let subordinates fall back to plain text python as opposed to structured relation data.

I feel that adding all the possible settings from [1] could lead to maintenance strain for relatively little gain.

Let me know please if you still feel this is the route we should take.

http://docs.openstack.org/developer/horizon/topics/settings.html#pluggable-settings-label

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #4994 openstack-dashboard-next for saviq mp260461
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/11543523/
Build: http://10.245.162.77:8080/job/charm_lint_check/4994/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #4674 openstack-dashboard-next for saviq mp260461
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/4674/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #4400 openstack-dashboard-next for saviq mp260461
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/11543632/
Build: http://10.245.162.77:8080/job/charm_amulet_test/4400/

[Billy Olsen (billy-olsen)]

Hey Michal, can you fix the lint errors and re-propose? I'm not sure if the amulet tests are passing or not due to issues beyond your control during the last osci run for this branch.

review: Needs Fixing

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #8755 openstack-dashboard-next for saviq mp260461
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/12197832/
Build: http://10.245.162.77:8080/job/charm_lint_check/8755/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #8086 openstack-dashboard-next for saviq mp260461
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/8086/

[Michał Sawicz (saviq)]

@Billy: I'm not sure what to do, lint passes locally, and if I change the indentation, it fails. It's as if flake8 on jenkins is old or something?

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #6032 openstack-dashboard-next for saviq mp260461
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/6032/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #8819 openstack-dashboard-next for saviq mp260461
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/12205038/
Build: http://10.245.162.77:8080/job/charm_lint_check/8819/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #8147 openstack-dashboard-next for saviq mp260461
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/8147/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #8820 openstack-dashboard-next for saviq mp260461
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/12205136/
Build: http://10.245.162.77:8080/job/charm_lint_check/8820/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #8148 openstack-dashboard-next for saviq mp260461
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/8148/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #8149 openstack-dashboard-next for saviq mp260461
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/8149/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #8822 openstack-dashboard-next for saviq mp260461
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/12205246/
Build: http://10.245.162.77:8080/job/charm_lint_check/8822/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #6054 openstack-dashboard-next for saviq mp260461
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [test] Error 124
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/12205259/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6054/

[Michał Sawicz (saviq)]

There's a simpler way we want to approach this now:

https://code.launchpad.net/~saviq/charms/trusty/openstack-dashboard/simplify-settings/+merge/269342

review: Disapprove

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #6056 openstack-dashboard-next for saviq mp260461
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/12205357/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6056/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #6053 openstack-dashboard-next for saviq mp260461
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/6053/

=== modified file 'hooks/charmhelpers/contrib/openstack/context.py'
--- hooks/charmhelpers/contrib/openstack/context.py	2015-08-19 13:51:03 +0000
+++ hooks/charmhelpers/contrib/openstack/context.py	2015-08-27 11:49:36 +0000
@@ -199,6 +199,15 @@
         raise NotImplementedError
 
 
+class OSPatternContextGenerator(OSContextGenerator):
+    """Base class for pattern context generators.
+
+    __call__ should return a dictionary of { tuple: dict }, where the tuple
+    will be used as input for format() for the filename pattern as registered
+    by OSConfigRenderer.register_pattern().
+    """
+
+
 class SharedDBContext(OSContextGenerator):
     interfaces = ['shared-db']
 

=== modified file 'hooks/charmhelpers/contrib/openstack/templating.py'
--- hooks/charmhelpers/contrib/openstack/templating.py	2015-07-29 10:48:39 +0000
+++ hooks/charmhelpers/contrib/openstack/templating.py	2015-08-27 11:49:36 +0000
@@ -14,7 +14,9 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
 
+import glob
 import os
+import string
 
 import six
 
@@ -25,6 +27,7 @@
     INFO
 )
 from charmhelpers.contrib.openstack.utils import OPENSTACK_CODENAMES
+from charmhelpers.contrib.openstack.context import OSPatternContextGenerator
 
 try:
     from jinja2 import FileSystemLoader, ChoiceLoader, Environment, exceptions
@@ -96,7 +99,7 @@
         else:
             self.contexts = contexts
 
-        self._complete_contexts = []
+        self._complete_contexts = set()
 
     def context(self):
         ctxt = {}
@@ -105,9 +108,7 @@
             if _ctxt:
                 ctxt.update(_ctxt)
                 # track interfaces for every complete context.
-                [self._complete_contexts.append(interface)
-                 for interface in context.interfaces
-                 if interface not in self._complete_contexts]
+                self._complete_contexts.update(context.interfaces)
         return ctxt
 
     def complete_contexts(self):
@@ -120,6 +121,41 @@
         return self._complete_contexts
 
 
+class OSPatternConfigTemplate(OSConfigTemplate):
+    """
+    Associates a config pattern template with a list of context generators.
+    Responsible for constructing a template context based on those generators.
+    """
+    def __init__(self, pattern, contexts):
+        self.pattern = pattern
+        super(OSPatternConfigTemplate, self).__init__(config_file=None,
+                                                      contexts=contexts)
+
+    def context(self):
+        base_ctxt = {}
+        ctxt = {}
+        for context in self.contexts:
+            _ctxt = context()
+            if not _ctxt:
+                continue
+            elif isinstance(context, OSPatternContextGenerator):
+                # for each returned key initialize its context with base_ctxt
+                # if not defined before and update with new data
+                for k, v in _ctxt.items():
+                    if k not in ctxt:
+                        ctxt[k] = base_ctxt.copy()
+                    ctxt[k].update(v)
+            else:
+                # update the base context and all pre-existing file-specific
+                # contexts
+                base_ctxt.update(_ctxt)
+                for key in ctxt:
+                    ctxt[key].update(_ctxt)
+            # track interfaces for every complete context.
+            self._complete_contexts.update(context.interfaces)
+        return ctxt
+
+
 class OSConfigRenderer(object):
     """
     This class provides a common templating system to be used by OpenStack
@@ -132,6 +168,13 @@
         # import some common context generates from charmhelpers
         from charmhelpers.contrib.openstack import context
 
+        # or create your own
+        class SimpleContextGenerator(OSContextGenerator):
+            def __call__():
+                return {
+                    'key': 'value'
+                }
+
         # Create a renderer object for a specific OS release.
         configs = OSConfigRenderer(templates_dir='/tmp/templates',
                                    openstack_release='folsom')
@@ -142,12 +185,31 @@
         configs.register(config_file='/etc/nova/api-paste.ini',
                          contexts=[context.IdentityServiceContext()])
         configs.register(config_file='/etc/haproxy/haproxy.conf',
-                         contexts=[context.HAProxyContext()])
+                         contexts=[context.HAProxyContext(),
+                                   SimpleContextGenerator()])
         # write out a single config
         configs.write('/etc/nova/nova.conf')
         # write out all registered configs
         configs.write_all()
 
+    Using patterns::
+        class DashboardContextGenerator(OSPatternContextGenerator):
+            def __call__():
+                return {
+                    (40, 'router'): { 'DISABLED': True }
+                }
+
+        configs.register_pattern(
+            pattern='/usr/share/openstack-dashboard/openstack_dashboard'
+                    '/enabled/_{}_juju_{}.py',
+            contexts=[
+                DashboardContextGenerator()
+            ])
+        # delete all files matching the pattern and
+        # write _40_juju_router.py anew
+        configs.write('/usr/share/openstack-dashboard/openstack_dashboard'
+                      '/enabled/_{}_juju_{}.py')
+
     **OpenStack Releases and template loading**
 
     When the object is instantiated, it is associated with a specific OS
@@ -219,6 +281,15 @@
                                                        contexts=contexts)
         log('Registered config file: %s' % config_file, level=INFO)
 
+    def register_pattern(self, pattern, contexts):
+        """
+        Register a config file name pattern with a list of context generators
+        to be called during rendering. Use standard format() specification.
+        """
+        self.templates[pattern] = OSPatternConfigTemplate(pattern=pattern,
+                                                          contexts=contexts)
+        log('Registered config pattern: %s' % pattern, level=INFO)
+
     def _get_tmpl_env(self):
         if not self._tmpl_env:
             loader = get_loader(self.templates_dir, self.openstack_release)
@@ -234,7 +305,8 @@
         if config_file not in self.templates:
             log('Config not registered: %s' % config_file, level=ERROR)
             raise OSConfigException
-        ctxt = self.templates[config_file].context()
+        ostemplate = self.templates[config_file]
+        ctxt = ostemplate.context()
 
         _tmpl = os.path.basename(config_file)
         try:
@@ -253,7 +325,14 @@
                 raise e
 
         log('Rendering from template: %s' % _tmpl, level=INFO)
-        return template.render(ctxt)
+
+        if not isinstance(ostemplate, OSPatternConfigTemplate):
+            ctxt = {(): ctxt}
+
+        renders = {}
+        for args, file_ctxt in ctxt.items():
+            renders[args] = template.render(file_ctxt)
+        return renders
 
     def write(self, config_file):
         """
@@ -263,10 +342,16 @@
             log('Config not registered: %s' % config_file, level=ERROR)
             raise OSConfigException
 
-        _out = self.render(config_file)
-
-        with open(config_file, 'wb') as out:
-            out.write(_out)
+        renders = self.render(config_file)
+
+        files = glob.glob(''.join([t[0] + ('' if t[1] is None else '*')
+                          for t in string.Formatter().parse(config_file)]))
+        for name in files:
+            os.unlink(name)
+
+        for args, render in renders.items():
+            with open(config_file.format(*args), 'wb') as out:
+                out.write(render)
 
         log('Wrote template %s.' % config_file, level=INFO)
 

=== modified file 'hooks/charmhelpers/core/host.py'
=== modified file 'hooks/horizon_contexts.py'
--- hooks/horizon_contexts.py	2015-04-09 14:56:00 +0000
+++ hooks/horizon_contexts.py	2015-08-27 11:49:36 +0000
@@ -10,6 +10,7 @@
 )
 from charmhelpers.contrib.openstack.context import (
     OSContextGenerator,
+    OSPatternContextGenerator,
     HAProxyContext,
     context_complete
 )
@@ -27,6 +28,7 @@
 
 from base64 import b64decode
 import os
+import re
 
 
 class HorizonHAProxyContext(HAProxyContext):
@@ -172,3 +174,52 @@
             'disable_router': False if config('profile') in ['cisco'] else True
         }
         return ctxt
+
+
+class LocalSettingsContext(OSContextGenerator):
+    def __call__(self):
+        ''' Additional config stanzas to be appended to local_settings.py '''
+
+        relations = []
+
+        for rid in relation_ids("plugin"):
+            try:
+                unit = related_units(rid)[0]
+            except IndexError:
+                pass
+            else:
+                rdata = relation_get(unit=unit, rid=rid)
+                if set(('local-settings', 'priority')) <= set(rdata.keys()):
+                    relations.append((unit, rdata))
+
+        ctxt = {
+            'settings': [
+                '# {0}\n{1}'.format(u, rd['local-settings'])
+                for u, rd in sorted(relations,
+                                    key=lambda r: r[1]['priority'])]
+        }
+        return ctxt
+
+
+class PluginsContext(OSPatternContextGenerator):
+    def __call__(self):
+
+        plugins = {}
+
+        for rid in relation_ids("plugin"):
+            try:
+                unit = related_units(rid)[0]
+            except IndexError:
+                pass
+            else:
+                rdata = relation_get(unit=unit, rid=rid)
+                try:
+                    if rdata['priority'] is not None and rdata['plugin-file']:
+                        service = re.sub('[^a-z0-9_]', '_', unit.split('/')[0])
+                        plugins[(rdata['priority'], service)] = {
+                            'unit': unit,
+                            'plugin_file': rdata['plugin-file']}
+                except KeyError:
+                    pass
+
+        return plugins

=== modified file 'hooks/horizon_hooks.py'
--- hooks/horizon_hooks.py	2015-05-07 14:33:05 +0000
+++ hooks/horizon_hooks.py	2015-08-27 11:49:36 +0000
@@ -33,7 +33,7 @@
     register_configs,
     restart_map,
     services,
-    LOCAL_SETTINGS, HAPROXY_CONF,
+    LOCAL_SETTINGS, HAPROXY_CONF, PLUGIN_SETTINGS,
     enable_ssl,
     do_openstack_upgrade,
     git_install,
@@ -244,6 +244,18 @@
     nrpe_setup.write()
 
 
[e-mail]('plugin-relation-joined')
+def plugin_relation_joined():
+    relation_set(release=os_release("openstack-dashboard"))
+
+
[e-mail]('plugin-relation-changed')
+@restart_on_change(restart_map())
+def update_plugin_config():
+    CONFIGS.write(LOCAL_SETTINGS)
+    CONFIGS.write(PLUGIN_SETTINGS)
+
+
 def main():
     try:
         hooks.execute(sys.argv)

=== modified file 'hooks/horizon_utils.py'
--- hooks/horizon_utils.py	2015-07-15 18:46:45 +0000
+++ hooks/horizon_utils.py	2015-08-27 11:49:36 +0000
@@ -5,6 +5,7 @@
 import pwd
 import subprocess
 import shutil
+import string
 from collections import OrderedDict
 
 import charmhelpers.contrib.openstack.context as context
@@ -93,6 +94,9 @@
 APACHE_DEFAULT = "%s/sites-available/default" % (APACHE_CONF_DIR)
 ROUTER_SETTING = \
     "/usr/share/openstack-dashboard/openstack_dashboard/enabled/_40_router.py"
+PLUGIN_SETTINGS = \
+    "/usr/share/openstack-dashboard/openstack_dashboard/local/enabled" \
+    "/_{}_juju_{}.py"
 
 TEMPLATES = 'templates'
 
@@ -100,7 +104,8 @@
     (LOCAL_SETTINGS, {
         'hook_contexts': [horizon_contexts.HorizonContext(),
                           horizon_contexts.IdentityServiceContext(),
-                          context.SyslogContext()],
+                          context.SyslogContext(),
+                          horizon_contexts.LocalSettingsContext()],
         'services': ['apache2']
     }),
     (APACHE_CONF, {
@@ -143,6 +148,10 @@
         'hook_contexts': [horizon_contexts.RouterSettingContext()],
         'services': ['apache2'],
     }),
+    (PLUGIN_SETTINGS, {
+        'hook_contexts': [horizon_contexts.PluginsContext()],
+        'services': ['apache2'],
+    }),
 ])
 
 
@@ -181,6 +190,11 @@
     if os.path.exists(os.path.dirname(ROUTER_SETTING)):
         configs.register(ROUTER_SETTING,
                          CONFIG_FILES[ROUTER_SETTING]['hook_contexts'])
+
+    if os_release('openstack_dashboard') >= 'icehouse':
+        configs.register_pattern(PLUGIN_SETTINGS,
+                                 CONFIG_FILES[PLUGIN_SETTINGS]
+                                             ['hook_contexts'])
     return configs
 
 
@@ -198,7 +212,10 @@
         for svc in ctxt['services']:
             svcs.append(svc)
         if svcs:
-            _map.append((f, svcs))
+            # replace all formatting in path with asterisks for glob
+            path = ''.join([t[0] + ('' if t[1] is None else '*')
+                           for t in string.Formatter().parse(f)])
+            _map.append((path, svcs))
     return OrderedDict(_map)
 
 

=== added symlink 'hooks/plugin-relation-changed'
=== target is u'horizon_hooks.py'
=== added symlink 'hooks/plugin-relation-joined'
=== target is u'horizon_hooks.py'
=== modified file 'metadata.yaml'
--- metadata.yaml	2014-10-30 03:30:36 +0000
+++ metadata.yaml	2015-08-27 11:49:36 +0000
@@ -17,6 +17,9 @@
   ha:
     interface: hacluster
     scope: container
+  plugin:
+    interface: horizon-plugin
+    scope: container
 peers:
   cluster:
     interface: openstack-dashboard-ha

=== modified file 'templates/essex/local_settings.py'
--- templates/essex/local_settings.py	2014-02-27 10:07:57 +0000
+++ templates/essex/local_settings.py	2015-08-27 11:49:36 +0000
@@ -118,3 +118,5 @@
             }
         }
 }
+
+{{ settings|join('\n\n') }}

=== modified file 'templates/folsom/local_settings.py'
--- templates/folsom/local_settings.py	2014-05-28 16:05:37 +0000
+++ templates/folsom/local_settings.py	2015-08-27 11:49:36 +0000
@@ -167,3 +167,5 @@
 # offline compression by default.  To enable online compression, install
 # the node-less package and enable the following option.
 COMPRESS_OFFLINE = {{ compress_offline }}
+
+{{ settings|join('\n\n') }}
\ No newline at end of file

=== modified file 'templates/grizzly/local_settings.py'
--- templates/grizzly/local_settings.py	2014-05-28 16:05:37 +0000
+++ templates/grizzly/local_settings.py	2015-08-27 11:49:36 +0000
@@ -263,3 +263,5 @@
         }
     }
 }
+
+{{ settings|join('\n\n') }}

=== modified file 'templates/havana/local_settings.py'
--- templates/havana/local_settings.py	2014-07-22 07:18:55 +0000
+++ templates/havana/local_settings.py	2015-08-27 11:49:36 +0000
@@ -483,3 +483,5 @@
 # installations should have this set accordingly.  For more information
 # see https://docs.djangoproject.com/en/dev/ref/settings/.
 ALLOWED_HOSTS = '*'
+
+{{ settings|join('\n\n') }}
\ No newline at end of file

=== added file 'templates/icehouse/_{}_juju_{}.py'
--- templates/icehouse/_{}_juju_{}.py	1970-01-01 00:00:00 +0000
+++ templates/icehouse/_{}_juju_{}.py	2015-08-27 11:49:36 +0000
@@ -0,0 +1,2 @@
+# {{ unit }}
+{{ plugin_file }}
\ No newline at end of file

=== modified file 'templates/icehouse/local_settings.py'
--- templates/icehouse/local_settings.py	2014-12-01 23:45:41 +0000
+++ templates/icehouse/local_settings.py	2015-08-27 11:49:36 +0000
@@ -514,3 +514,5 @@
 # installations should have this set accordingly.  For more information
 # see https://docs.djangoproject.com/en/dev/ref/settings/.
 ALLOWED_HOSTS = '*'
+
+{{ settings|join('\n\n') }}
\ No newline at end of file

=== modified file 'templates/juno/local_settings.py'
--- templates/juno/local_settings.py	2014-12-01 23:45:41 +0000
+++ templates/juno/local_settings.py	2015-08-27 11:49:36 +0000
@@ -619,3 +619,5 @@
 # installations should have this set accordingly.  For more information
 # see https://docs.djangoproject.com/en/dev/ref/settings/.
 ALLOWED_HOSTS = '*'
+
+{{ settings|join('\n\n') }}
\ No newline at end of file

=== modified file 'unit_tests/test_horizon_contexts.py'
--- unit_tests/test_horizon_contexts.py	2015-04-09 14:34:44 +0000
+++ unit_tests/test_horizon_contexts.py	2015-08-27 11:49:36 +0000
@@ -251,3 +251,46 @@
         self.test_config.set('profile', None)
         self.assertEquals(horizon_contexts.RouterSettingContext()(),
                           {'disable_router': True, })
+
+    def test_LocalSettingsContext(self):
+        self.relation_ids.return_value = ['plugin:0', 'plugin-too:0']
+        self.related_units.side_effect = [['horizon-plugin/0'],
+                                          ['horizon-plugin-too/0']]
+        self.relation_get.side_effect = [{'priority': 99,
+                                          'local-settings': 'FOO = True'},
+                                         {'priority': 60,
+                                          'local-settings': 'BAR = False'}]
+
+        self.assertEquals(horizon_contexts.LocalSettingsContext()(),
+                          {'settings': ['# horizon-plugin-too/0\n'
+                                        'BAR = False',
+                                        '# horizon-plugin/0\n'
+                                        'FOO = True']})
+
+    def test_PluginsContext(self):
+        self.relation_ids.return_value = ['plugin:0', 'plugin-too:0']
+        self.related_units.side_effect = [['horizon-plugin/0'],
+                                          ['horizon-plugin-too/0']]
+        self.relation_get.side_effect = [
+            {
+                'priority': 99,
+                'plugin-file': 'DASHBOARD = \'some_dashboard\'\n'
+                               'DISABLED = True'},
+            {
+                'priority': 60,
+                'plugin-file': 'PANEL = \'some_panel\'\n'
+                               'PANEL_DASHBOARD = \'admin\'\n'
+                               'PANEL_GROUP = \'admin\'\n'
+                               'REMOVE_PANEL = True'}]
+
+        self.assertEquals(horizon_contexts.PluginsContext()(),
+                          {(99, 'horizon_plugin'): {
+                           'unit': 'horizon-plugin/0',
+                           'plugin_file': 'DASHBOARD = \'some_dashboard\'\n'
+                                          'DISABLED = True'},
+                           (60, 'horizon_plugin_too'): {
+                           'unit': 'horizon-plugin-too/0',
+                           'plugin_file': 'PANEL = \'some_panel\'\n'
+                                          'PANEL_DASHBOARD = \'admin\'\n'
+                                          'PANEL_GROUP = \'admin\'\n'
+                                          'REMOVE_PANEL = True'}})

=== modified file 'unit_tests/test_horizon_hooks.py'
--- unit_tests/test_horizon_hooks.py	2015-06-19 16:08:08 +0000
+++ unit_tests/test_horizon_hooks.py	2015-08-27 11:49:36 +0000
@@ -135,8 +135,8 @@
     def test_upgrade_charm_hook(self, _git_requested, _service, _hash):
         _git_requested.return_value = False
         side_effects = []
-        [side_effects.append(None) for f in RESTART_MAP.keys()]
-        [side_effects.append('bar') for f in RESTART_MAP.keys()]
+        [side_effects.append({}) for f in RESTART_MAP.keys()]
+        [side_effects.append({f: 'bar'}) for f in RESTART_MAP.keys()]
         _hash.side_effect = side_effects
         self.filter_installed_packages.return_value = ['foo']
         self._call_hook('upgrade-charm')

=== modified file 'unit_tests/test_horizon_utils.py'
--- unit_tests/test_horizon_utils.py	2015-05-08 12:28:54 +0000
+++ unit_tests/test_horizon_utils.py	2015-08-27 11:49:36 +0000
@@ -57,6 +57,8 @@
             ('/etc/haproxy/haproxy.cfg', ['haproxy']),
             ('/usr/share/openstack-dashboard/openstack_dashboard/enabled/'
              '_40_router.py', ['apache2']),
+            ('/usr/share/openstack-dashboard/openstack_dashboard/local/'
+             'enabled/_*_juju_*.py', ['apache2'])
         ])
         self.assertEquals(horizon_utils.restart_map(), ex_map)
 
@@ -142,6 +144,33 @@
                 call(conf, horizon_utils.CONFIG_FILES[conf]['hook_contexts']))
         configs.register.assert_has_calls(calls)
 
+    @patch('os.path.isdir')
+    @patch('os.path.exists')
+    def test_register_configs_icehouse(self, _exists, _isdir):
+        _exists.return_value = True
+        _isdir.return_value = True
+        self.os_release.return_value = 'icehouse'
+        self.cmp_pkgrevno.return_value = -1
+        configs = horizon_utils.register_configs()
+        confs = [horizon_utils.LOCAL_SETTINGS,
+                 horizon_utils.HAPROXY_CONF,
+                 horizon_utils.PORTS_CONF,
+                 horizon_utils.APACHE_DEFAULT,
+                 horizon_utils.APACHE_CONF,
+                 horizon_utils.APACHE_SSL,
+                 horizon_utils.ROUTER_SETTING]
+        calls = []
+        for conf in confs:
+            calls.append(
+                call(conf,
+                     horizon_utils.CONFIG_FILES[conf]['hook_contexts']))
+        configs.register.assert_has_calls(calls)
+
+        configs.register_pattern.assert_has_calls([
+            call(horizon_utils.PLUGIN_SETTINGS,
+                 horizon_utils.CONFIG_FILES[horizon_utils.PLUGIN_SETTINGS]
+                                           ['hook_contexts'])])
+
     @patch.object(horizon_utils, 'git_install_requested')
     @patch.object(horizon_utils, 'git_clone_and_install')
     @patch.object(horizon_utils, 'git_post_install')