Merge lp:~bac/charms/trusty/openstack-dashboard/apache-slugs into lp:~yellow/charms/trusty/openstack-dashboard/dashboard-plugin

[Brad Crittenden]

Allow the ability to add controls to the end http and https configurations. Useful for things like rewrite stanzas.

[Brad Crittenden (bac)]

This branch was started based on the 'next' version of the openstack-dashboard, so it brings our up-to-date with the latest.

[j.c.sackett (jcsackett)]

LGTM, thanks Brad.

review: Approve

[Jay R. Wren (evarlast)]

LGTM.

review: Approve

=== modified file 'Makefile'
--- Makefile	2015-08-22 04:13:34 +0000
+++ Makefile	2015-10-14 14:39:53 +0000
@@ -9,11 +9,10 @@
 test:
 	@# Bundletester expects unit tests here.
 	@echo Starting tests...
-	@$(PYTHON) /usr/bin/nosetests --nologcapture --with-coverage unit_tests
+	@$(PYTHON) /usr/bin/nosetests -v --nologcapture --with-coverage unit_tests
 
 functional_test:
 	@echo Starting Amulet tests...
-	#   https://bugs.launchpad.net/amulet/+bug/1320357
 	@juju test -v -p AMULET_HTTP_PROXY,AMULET_OS_VIP --timeout 2700
 
 bin/charm_helpers_sync.py:

=== modified file 'actions.yaml'
--- actions.yaml	2015-04-07 13:58:41 +0000
+++ actions.yaml	2015-10-14 14:39:53 +0000
@@ -1,2 +1,4 @@
 git-reinstall:
   description: Reinstall openstack-dashboard from the openstack-origin-git repositories.
+openstack-upgrade:
+  description: Perform openstack upgrades. Config option action-managed-upgrade must be set to True.

=== added symlink 'actions/openstack-upgrade'
=== target is u'openstack_upgrade.py'
=== added file 'actions/openstack_upgrade.py'
--- actions/openstack_upgrade.py	1970-01-01 00:00:00 +0000
+++ actions/openstack_upgrade.py	2015-10-14 14:39:53 +0000
@@ -0,0 +1,34 @@
+#!/usr/bin/python
+import sys
+
+sys.path.append('hooks/')
+
+from charmhelpers.contrib.openstack.utils import (
+    do_action_openstack_upgrade,
+)
+
+from horizon_utils import (
+    do_openstack_upgrade,
+)
+
+from horizon_hooks import (
+    config_changed,
+    CONFIGS,
+)
+
+
+def openstack_upgrade():
+    """Upgrade packages to config-set Openstack version.
+
+    If the charm was installed from source we cannot upgrade it.
+    For backwards compatibility a config flag must be set for this
+    code to run, otherwise a full service level upgrade will fire
+    on config-changed."""
+
+    if do_action_openstack_upgrade('openstack-dashboard',
+                                   do_openstack_upgrade,
+                                   CONFIGS):
+        config_changed()
+
+if __name__ == '__main__':
+    openstack_upgrade()

=== modified file 'config.yaml'
--- config.yaml	2015-07-10 14:18:48 +0000
+++ config.yaml	2015-10-14 14:39:53 +0000
@@ -153,6 +153,14 @@
       In order for this charm to function correctly, the privacy extension
       must be disabled and a non-temporary address must be
       configured/available on your network interface.
+  endpoint-type:
+    type: string
+    default:
+    description: |
+      Specifies the endpoint types to use for endpoints in the Keystone
+      service catalog. Valid values are 'publicURL', 'internalURL',
+      and 'adminURL'. Both the primary and secondary endpoint types can
+      be specified by providing multiple comma delimited values.
   nagios_context:
     default: "juju"
     type: string
@@ -163,7 +171,7 @@
       .
         juju-postgresql-0
       .
-      If you're running multiple environments with the same services in them
+      If you are running multiple environments with the same services in them
       this allows you to differentiate between them.
   nagios_check_http_params:
     default: "-H localhost -I 127.0.0.1 -u '/' -e 200,301,302"
@@ -175,4 +183,25 @@
     description: |
       A comma-separated list of nagios servicegroups. If left empty, the
       nagios_context will be used as the servicegroup.
-
+  action-managed-upgrade:
+    type: boolean
+    default: False
+    description: |
+      If True enables openstack upgrades for this charm via juju actions.
+      You will still need to set openstack-origin to the new repository but
+      instead of an upgrade running automatically across all units, it will
+      wait for you to execute the openstack-upgrade action for this charm on
+      each unit. If False it will revert to existing behavior of upgrading
+      all units on config change.
+  apache_http_addendum:
+    type: string
+    default: ''
+    description: |
+      Extra stanzas to be inserted into the HTTP virtual host configuration.
+      May be used to specify rewrite rules, for example.
+  apache_https_addendum:
+    type: string
+    default: ''
+    description: |
+      Extra stanzas to be inserted into the HTTPS virtual host configuration.
+      May be used to specify rewrite rules, for example.

=== modified file 'hooks/charmhelpers/contrib/openstack/utils.py'
--- hooks/charmhelpers/contrib/openstack/utils.py	2015-09-04 13:59:26 +0000
+++ hooks/charmhelpers/contrib/openstack/utils.py	2015-10-14 14:39:53 +0000
@@ -25,6 +25,7 @@
 import re
 
 import six
+import traceback
 import yaml
 
 from charmhelpers.contrib.network import ip
@@ -34,6 +35,8 @@
 )
 
 from charmhelpers.core.hookenv import (
+    action_fail,
+    action_set,
     config,
     log as juju_log,
     charm_dir,
@@ -114,6 +117,7 @@
     ('2.2.1', 'kilo'),
     ('2.2.2', 'kilo'),
     ('2.3.0', 'liberty'),
+    ('2.4.0', 'liberty'),
 ])
 
 # >= Liberty version->codename mapping
@@ -748,3 +752,47 @@
         return projects[key]
 
     return None
+
+
+def do_action_openstack_upgrade(package, upgrade_callback, configs):
+    """Perform action-managed OpenStack upgrade.
+
+    Upgrades packages to the configured openstack-origin version and sets
+    the corresponding action status as a result.
+
+    If the charm was installed from source we cannot upgrade it.
+    For backwards compatibility a config flag (action-managed-upgrade) must
+    be set for this code to run, otherwise a full service level upgrade will
+    fire on config-changed.
+
+    @param package: package name for determining if upgrade available
+    @param upgrade_callback: function callback to charm's upgrade function
+    @param configs: templating object derived from OSConfigRenderer class
+
+    @return: True if upgrade successful; False if upgrade failed or skipped
+    """
+    ret = False
+
+    if git_install_requested():
+        action_set({'outcome': 'installed from source, skipped upgrade.'})
+    else:
+        if openstack_upgrade_available(package):
+            if config('action-managed-upgrade'):
+                juju_log('Upgrading OpenStack release')
+
+                try:
+                    upgrade_callback(configs=configs)
+                    action_set({'outcome': 'success, upgrade completed.'})
+                    ret = True
+                except:
+                    action_set({'outcome': 'upgrade failed, see traceback.'})
+                    action_set({'traceback': traceback.format_exc()})
+                    action_fail('do_openstack_upgrade resulted in an '
+                                'unexpected error')
+            else:
+                action_set({'outcome': 'action-managed-upgrade config is '
+                                       'False, skipped upgrade.'})
+        else:
+            action_set({'outcome': 'no upgrade available.'})
+
+    return ret

=== added symlink 'hooks/dashboard-plugin-relation-changed'
=== target is u'horizon_hooks.py'
=== added symlink 'hooks/dashboard-plugin-relation-joined'
=== target is u'horizon_hooks.py'
=== removed symlink 'hooks/dashboard-plugin-relation-joined'
=== target was u'horizon_hooks.py'
=== modified file 'hooks/horizon_contexts.py'
--- hooks/horizon_contexts.py	2015-04-09 14:56:00 +0000
+++ hooks/horizon_contexts.py	2015-10-14 14:39:53 +0000
@@ -6,7 +6,8 @@
     relation_get,
     local_unit,
     unit_get,
-    log
+    log,
+    ERROR,
 )
 from charmhelpers.contrib.openstack.context import (
     OSContextGenerator,
@@ -28,6 +29,12 @@
 from base64 import b64decode
 import os
 
+VALID_ENDPOINT_TYPES = {
+    'PUBLICURL': 'publicURL',
+    'INTERNALURL': 'internalURL',
+    'ADMINURL': 'adminURL',
+}
+
 
 class HorizonHAProxyContext(HAProxyContext):
     def __call__(self):
@@ -69,6 +76,22 @@
 class IdentityServiceContext(OSContextGenerator):
     interfaces = ['identity-service']
 
+    def normalize(self, endpoint_type):
+        """Normalizes the endpoint type values.
+
+        :param endpoint_type (string): the endpoint type to normalize.
+        :raises: Exception if the endpoint type is not valid.
+        :return (string): the normalized form of the endpoint type.
+        """
+        normalized_form = VALID_ENDPOINT_TYPES.get(endpoint_type.upper(), None)
+        if not normalized_form:
+            msg = ('Endpoint type specified %s is not a valid'
+                   ' endpoint type' % endpoint_type)
+            log(msg, ERROR)
+            raise Exception(msg)
+
+        return normalized_form
+
     def __call__(self):
         log('Generating template context for identity-service')
         ctxt = {}
@@ -106,6 +129,21 @@
             avail_regions = map(lambda r: {'endpoint': r[0], 'title': r[1]},
                                 regions)
             ctxt['regions'] = sorted(avail_regions)
+
+        # Allow the endpoint types to be specified via a config parameter.
+        # The config parameter accepts either:
+        #  1. a single endpoint type to be specified, in which case the
+        #     primary endpoint is configured
+        #  2. a list of endpoint types, in which case the primary endpoint
+        #     is taken as the first entry and the secondary endpoint is
+        #     taken as the second entry. All subsequent entries are ignored.
+        ep_types = config('endpoint-type')
+        if ep_types:
+            ep_types = [self.normalize(e) for e in ep_types.split(',')]
+            ctxt['primary_endpoint'] = ep_types[0]
+            if len(ep_types) > 1:
+                ctxt['secondary_endpoint'] = ep_types[1]
+
         return ctxt
 
 
@@ -134,7 +172,8 @@
         ''' Grab cert and key from configuraton for SSL config '''
         ctxt = {
             'http_port': 70,
-            'https_port': 433
+            'https_port': 433,
+            'apache_http_addendum': config("apache_http_addendum"),
         }
         return ctxt
 
@@ -162,6 +201,8 @@
             ctxt = {
                 'ssl_configured': False,
             }
+        ctxt['apache_https_addendum'] = config("apache_https_addendum")
+
         return ctxt
 
 
@@ -172,3 +213,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-09-03 19:18:51 +0000
+++ hooks/horizon_hooks.py	2015-10-14 14:39:53 +0000
@@ -58,7 +58,7 @@
 CONFIGS = register_configs()
 
 
[e-mail]('install')
[e-mail]('install.real')
 def install():
     execd_preinstall()
     configure_installation_source(config('openstack-origin'))
@@ -106,7 +106,7 @@
     if git_install_requested():
         if config_value_changed('openstack-origin-git'):
             git_install(config('openstack-origin-git'))
-    else:
+    elif not config('action-managed-upgrade'):
         if openstack_upgrade_available('openstack-dashboard'):
             do_openstack_upgrade(configs=CONFIGS)
 
@@ -247,16 +247,23 @@
 
 
 @hooks.hook('dashboard-plugin-relation-joined')
-def update_dashboard_plugin(rel_id=None):
+def plugin_relation_joined(rel_id=None):
     if git_install_requested():
         bin_path = git_pip_venv_dir(config('openstack-origin-git'))
     else:
         bin_path = '/usr/bin'
-    relation_set(relation_id=rel_id,
+    relation_set(release=os_release("openstack-dashboard"),
+                 relation_id=rel_id,
                  bin_path=bin_path,
                  openstack_dir=INSTALL_DIR)
 
 
[e-mail]('dashboard-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-09-03 19:18:51 +0000
+++ hooks/horizon_utils.py	2015-10-14 14:39:53 +0000
@@ -101,7 +101,8 @@
     (LOCAL_SETTINGS, {
         'hook_contexts': [horizon_contexts.HorizonContext(),
                           horizon_contexts.IdentityServiceContext(),
-                          context.SyslogContext()],
+                          context.SyslogContext(),
+                          horizon_contexts.LocalSettingsContext()],
         'services': ['apache2']
     }),
     (APACHE_CONF, {
@@ -262,12 +263,12 @@
         raise Exception("IPv6 is not supported in the charms for Ubuntu "
                         "versions less than Trusty 14.04")
 
-    # NOTE(xianghui): Need to install haproxy(1.5.3) from trusty-backports
-    # to support ipv6 address, so check is required to make sure not
-    # breaking other versions, IPv6 only support for >= Trusty
-    if ubuntu_rel == 'trusty':
-        add_source('deb http://archive.ubuntu.com/ubuntu trusty-backports'
-                   ' main')
+    # Need haproxy >= 1.5.3 for ipv6 so for Trusty if we are <= Kilo we need to
+    # use trusty-backports otherwise we can use the UCA.
+    os_pkg = 'openstack-dashboard'
+    if ubuntu_rel == 'trusty' and os_release(os_pkg) < 'liberty':
+        add_source('deb http://archive.ubuntu.com/ubuntu trusty-backports '
+                   'main')
         apt_update()
         apt_install('haproxy/trusty-backports', fatal=True)
 

=== modified symlink 'hooks/install' (properties changed: -x to +x)
=== target was u'horizon_hooks.py'
--- hooks/install	1970-01-01 00:00:00 +0000
+++ hooks/install	2015-10-14 14:39:53 +0000
@@ -0,0 +1,20 @@
+#!/bin/bash
+# Wrapper to deal with newer Ubuntu versions that don't have py2 installed
+# by default.
+
+declare -a DEPS=('apt' 'netaddr' 'netifaces' 'pip' 'yaml')
+
+check_and_install() {
+    pkg="${1}-${2}"
+    if ! dpkg -s ${pkg} 2>&1 > /dev/null; then
+        apt-get -y install ${pkg}
+    fi
+}
+
+PYTHON="python"
+
+for dep in ${DEPS[@]}; do
+    check_and_install ${PYTHON} ${dep}
+done
+
+exec ./hooks/install.real

=== added symlink 'hooks/install.real'
=== target is u'horizon_hooks.py'
=== modified file 'metadata.yaml'
--- metadata.yaml	2015-09-10 20:38:16 +0000
+++ metadata.yaml	2015-10-14 14:39:53 +0000
@@ -15,6 +15,7 @@
     interface: http
   dashboard-plugin:
     interface: dashboard-plugin
+    scope: container
 requires:
   identity-service:
     interface: keystone

=== modified file 'templates/default'
--- templates/default	2013-07-15 16:25:46 +0000
+++ templates/default	2015-10-14 14:39:53 +0000
@@ -29,4 +29,6 @@
 
         CustomLog ${APACHE_LOG_DIR}/access.log combined
 
+{{ apache_http_addendum }}
+
 </VirtualHost>

=== modified file 'templates/default-ssl'
--- templates/default-ssl	2013-07-15 16:25:46 +0000
+++ templates/default-ssl	2015-10-14 14:39:53 +0000
@@ -46,5 +46,7 @@
                 downgrade-1.0 force-response-1.0
         BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
 
+{{ apache_https_addendum }}
+
     </VirtualHost>
 </IfModule>

=== 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-10-14 14:39:53 +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-10-14 14:39:53 +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-10-14 14:39:53 +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-10-14 14:39:53 +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-10-14 14:39:53 +0000
@@ -212,6 +212,9 @@
 # in the Keystone service catalog. Use this setting when Horizon is running
 # external to the OpenStack environment. The default is 'publicURL'.
 #OPENSTACK_ENDPOINT_TYPE = "publicURL"
+{% if primary_endpoint -%}
+OPENSTACK_ENDPOINT_TYPE = {{ primary_endpoint }}
+{% endif -%}
 
 # SECONDARY_ENDPOINT_TYPE specifies the fallback endpoint type to use in the
 # case that OPENSTACK_ENDPOINT_TYPE is not present in the endpoints
@@ -219,6 +222,9 @@
 # external to the OpenStack environment. The default is None.  This
 # value should differ from OPENSTACK_ENDPOINT_TYPE if used.
 #SECONDARY_ENDPOINT_TYPE = "publicURL"
+{% if secondary_endpoint -%}
+SECONDARY_ENDPOINT_TYPE = {{ secondary_endpoint }}
+{% endif -%}
 
 # The number of objects (Swift containers/objects or images) to display
 # on a single page before providing a paging element (a "more" link)
@@ -514,3 +520,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-10-14 14:39:53 +0000
@@ -250,6 +250,9 @@
 # in the Keystone service catalog. Use this setting when Horizon is running
 # external to the OpenStack environment. The default is 'publicURL'.
 #OPENSTACK_ENDPOINT_TYPE = "publicURL"
+{% if primary_endpoint -%}
+OPENSTACK_ENDPOINT_TYPE = {{ primary_endpoint }}
+{% endif -%}
 
 # SECONDARY_ENDPOINT_TYPE specifies the fallback endpoint type to use in the
 # case that OPENSTACK_ENDPOINT_TYPE is not present in the endpoints
@@ -257,6 +260,9 @@
 # external to the OpenStack environment. The default is None.  This
 # value should differ from OPENSTACK_ENDPOINT_TYPE if used.
 #SECONDARY_ENDPOINT_TYPE = "publicURL"
+{% if secondary_endpoint -%}
+SECONDARY_ENDPOINT_TYPE = {{ secondary_endpoint }}
+{% endif -%}
 
 # The number of objects (Swift containers/objects or images) to display
 # on a single page before providing a paging element (a "more" link)
@@ -619,3 +625,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 'tests/00-setup'
--- tests/00-setup	2015-08-21 18:42:43 +0000
+++ tests/00-setup	2015-10-14 14:39:53 +0000
@@ -5,6 +5,7 @@
 sudo add-apt-repository --yes ppa:juju/stable
 sudo apt-get update --yes
 sudo apt-get install --yes amulet \
+                           distro-info-data \
                            python-cinderclient \
                            python-distro-info \
                            python-glanceclient \

=== modified file 'tests/tests.yaml'
--- tests/tests.yaml	2015-08-21 18:42:43 +0000
+++ tests/tests.yaml	2015-10-14 14:39:53 +0000
@@ -8,7 +8,7 @@
     - ppa:juju/stable
 packages:
     - amulet
-    - python-amulet
+    - distro-info-data
     - python-cinderclient
     - python-distro-info
     - python-glanceclient

=== added file 'unit_tests/test_actions_openstack_upgrade.py'
--- unit_tests/test_actions_openstack_upgrade.py	1970-01-01 00:00:00 +0000
+++ unit_tests/test_actions_openstack_upgrade.py	2015-10-14 14:39:53 +0000
@@ -0,0 +1,53 @@
+from mock import patch
+import os
+
+os.environ['JUJU_UNIT_NAME'] = 'openstack-dashboard'
+
+with patch('horizon_utils.register_configs') as register_configs:
+    import openstack_upgrade
+
+from test_utils import (
+    CharmTestCase
+)
+
+TO_PATCH = [
+    'do_openstack_upgrade',
+    'config_changed',
+]
+
+
+class TestHorizonUpgradeActions(CharmTestCase):
+
+    def setUp(self):
+        super(TestHorizonUpgradeActions, self).setUp(openstack_upgrade,
+                                                     TO_PATCH)
+
+    @patch('charmhelpers.contrib.openstack.utils.config')
+    @patch('charmhelpers.contrib.openstack.utils.action_set')
+    @patch('charmhelpers.contrib.openstack.utils.git_install_requested')
+    @patch('charmhelpers.contrib.openstack.utils.openstack_upgrade_available')
+    def test_openstack_upgrade_true(self, upgrade_avail, git_requested,
+                                    action_set, config):
+        git_requested.return_value = False
+        upgrade_avail.return_value = True
+        config.return_value = True
+
+        openstack_upgrade.openstack_upgrade()
+
+        self.assertTrue(self.do_openstack_upgrade.called)
+        self.assertTrue(self.config_changed.called)
+
+    @patch('charmhelpers.contrib.openstack.utils.config')
+    @patch('charmhelpers.contrib.openstack.utils.action_set')
+    @patch('charmhelpers.contrib.openstack.utils.git_install_requested')
+    @patch('charmhelpers.contrib.openstack.utils.openstack_upgrade_available')
+    def test_openstack_upgrade_false(self, upgrade_avail, git_requested,
+                                     action_set, config):
+        git_requested.return_value = False
+        upgrade_avail.return_value = True
+        config.return_value = False
+
+        openstack_upgrade.openstack_upgrade()
+
+        self.assertFalse(self.do_openstack_upgrade.called)
+        self.assertFalse(self.config_changed.called)

=== 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-10-14 14:39:53 +0000
@@ -47,19 +47,23 @@
         self.pwgen.return_value = "secret"
 
     def test_Apachecontext(self):
+        self.test_config.set('apache_http_addendum', 'RewriteEngine on')
         self.assertEquals(horizon_contexts.ApacheContext()(),
-                          {'http_port': 70, 'https_port': 433})
+                          {'http_port': 70, 'https_port': 433,
+                           'apache_http_addendum': 'RewriteEngine on'})
 
     @patch.object(horizon_contexts, 'get_ca_cert', lambda: None)
     @patch('os.chmod')
     def test_ApacheSSLContext_enabled(self, _chmod):
         self.get_cert.return_value = ('cert', 'key')
         self.b64decode.side_effect = ['cert', 'key']
+        self.test_config.set('apache_https_addendum', 'RewriteEngine off')
         with patch_open() as (_open, _file):
             self.assertEquals(horizon_contexts.ApacheSSLContext()(),
                               {'ssl_configured': True,
                                'ssl_cert': '/etc/ssl/certs/dashboard.cert',
-                               'ssl_key': '/etc/ssl/private/dashboard.key'})
+                               'ssl_key': '/etc/ssl/private/dashboard.key',
+                               'apache_https_addendum': 'RewriteEngine off'})
             _open.assert_has_calls([
                 call('/etc/ssl/certs/dashboard.cert', 'w'),
                 call('/etc/ssl/private/dashboard.key', 'w')
@@ -75,7 +79,8 @@
     def test_ApacheSSLContext_disabled(self):
         self.get_cert.return_value = (None, None)
         self.assertEquals(horizon_contexts.ApacheSSLContext()(),
-                          {'ssl_configured': False})
+                          {'ssl_configured': False,
+                           'apache_https_addendum': ''})
 
     def test_HorizonContext_defaults(self):
         self.assertEquals(horizon_contexts.HorizonContext()(),
@@ -212,6 +217,22 @@
                                       {'endpoint': 'http://foo:5000/v2.0',
                                        'title': 'regionTwo'}]})
 
+    def test_IdentityServiceContext_endpoint_type(self):
+        self.test_config.set('endpoint-type', 'internalURL')
+        self.assertEqual(horizon_contexts.IdentityServiceContext()(),
+                         {'primary_endpoint': 'internalURL'})
+
+    def test_IdentityServiceContext_multi_endpoint_types(self):
+        self.test_config.set('endpoint-type', 'internalURL,publicURL')
+        self.assertEqual(horizon_contexts.IdentityServiceContext()(),
+                         {'primary_endpoint': 'internalURL',
+                          'secondary_endpoint': 'publicURL'})
+
+    def test_IdentityServiceContext_invalid_endpoint_type(self):
+        self.test_config.set('endpoint-type', 'this_is_bad')
+        with self.assertRaises(Exception):
+            horizon_contexts.IdentityServiceContext()()
+
     def test_HorizonHAProxyContext_no_cluster(self):
         self.relation_ids.return_value = []
         self.local_unit.return_value = 'openstack-dashboard/0'
@@ -251,3 +272,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']})

=== modified file 'unit_tests/test_horizon_hooks.py'
--- unit_tests/test_horizon_hooks.py	2015-09-04 15:16:58 +0000
+++ unit_tests/test_horizon_hooks.py	2015-10-14 14:39:53 +0000
@@ -308,25 +308,32 @@
         self._call_hook('website-relation-joined')
         self.relation_set.assert_called_with(port=70, hostname='192.168.1.1')
 
+    @patch.object(hooks, 'os_release')
     @patch.object(hooks, 'git_install_requested')
-    def test_dashboard_config_joined_not_git(self, _git_requested):
+    def test_dashboard_config_joined_not_git(
+            self, _git_requested, _os_release):
         _git_requested.return_value = False
+        _os_release.return_value = 'vivid'
         self._call_hook('dashboard-plugin-relation-joined')
         self.relation_set.assert_called_with(
+            release='vivid',
             bin_path='/usr/bin',
             openstack_dir='/usr/share/openstack-dashboard',
             relation_id=None
         )
 
+    @patch.object(hooks, 'os_release')
     @patch.object(hooks, 'git_pip_venv_dir')
     @patch.object(hooks, 'git_install_requested')
-    def test_dashboard_config_joined_git(self, _git_requested,
-                                         _git_pip_venv_dir):
+    def test_dashboard_config_joined_git(
+            self, _git_requested, _git_pip_venv_dir, _os_release):
         expected_bin_path = '/mnt/fuji/venv'
         _git_requested.return_value = True
         _git_pip_venv_dir.return_value = expected_bin_path
+        _os_release.return_value = 'wily'
         self._call_hook('dashboard-plugin-relation-joined')
         self.relation_set.assert_called_with(
+            release='wily',
             bin_path=expected_bin_path,
             openstack_dir='/usr/share/openstack-dashboard',
             relation_id=None