Merge lp:~saviq/charms/trusty/openstack-dashboard/simplify-settings into lp:~openstack-charmers-archive/charms/trusty/openstack-dashboard/next

[Michał Sawicz]

Add support for plugins to inject settings into local_settings.py

First consumer of this:

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

[lp:~saviq/charms/trusty/openstack-dashboard/simplify-settings]

82. By Michał Sawicz on 2015-08-27

Undo test changes

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

charm_lint_check #8821 openstack-dashboard-next for saviq mp269342
    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/12205247/
Build: http://10.245.162.77:8080/job/charm_lint_check/8821/

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

charm_unit_test #8150 openstack-dashboard-next for saviq mp269342
    UNIT OK: passed

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

[lp:~saviq/charms/trusty/openstack-dashboard/simplify-settings]

83. By Michał Sawicz on 2015-08-27

Drop empty line

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

charm_amulet_test #6055 openstack-dashboard-next for saviq mp269342
    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/12205449/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6055/

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

charm_lint_check #8823 openstack-dashboard-next for saviq mp269342
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/8823/

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

charm_unit_test #8151 openstack-dashboard-next for saviq mp269342
    UNIT OK: passed

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

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

charm_amulet_test #6057 openstack-dashboard-next for saviq mp269342
    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/12205820/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6057/

[lp:~saviq/charms/trusty/openstack-dashboard/simplify-settings]

84. By Michał Sawicz on 2015-08-27

Merge next

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

charm_lint_check #8826 openstack-dashboard-next for saviq mp269342
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/8826/

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

charm_unit_test #8154 openstack-dashboard-next for saviq mp269342
    UNIT OK: passed

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

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

charm_amulet_test #6060 openstack-dashboard-next for saviq mp269342
    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/12206789/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6060/

[Liam Young (gnuoy)]

Superseded by lp:~gnuoy/charms/trusty/openstack-dashboard/plugin-relation

=== modified file 'hooks/horizon_contexts.py'
--- hooks/horizon_contexts.py	2015-04-09 14:56:00 +0000
+++ hooks/horizon_contexts.py	2015-08-27 15:02:42 +0000
@@ -172,3 +172,28 @@
             '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

=== modified file 'hooks/horizon_hooks.py'
--- hooks/horizon_hooks.py	2015-05-07 14:33:05 +0000
+++ hooks/horizon_hooks.py	2015-08-27 15:02:42 +0000
@@ -244,6 +244,17 @@
     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)
+
+
 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 15:02:42 +0000
@@ -100,7 +100,8 @@
     (LOCAL_SETTINGS, {
         'hook_contexts': [horizon_contexts.HorizonContext(),
                           horizon_contexts.IdentityServiceContext(),
-                          context.SyslogContext()],
+                          context.SyslogContext(),
+                          horizon_contexts.LocalSettingsContext()],
         'services': ['apache2']
     }),
     (APACHE_CONF, {

=== 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 15:02:42 +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 15:02:42 +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 15:02:42 +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 15:02:42 +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 15:02:42 +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

=== 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 15:02:42 +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 15:02:42 +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 15:02:42 +0000
@@ -251,3 +251,18 @@
         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']})