Merge "Define identity api version in api_versions dict"
diff --git a/horizon/files/horizon_settings/_horizon_settings.py b/horizon/files/horizon_settings/_horizon_settings.py
index 78bf00d..5e6fab4 100644
--- a/horizon/files/horizon_settings/_horizon_settings.py
+++ b/horizon/files/horizon_settings/_horizon_settings.py
@@ -30,6 +30,7 @@
POLICY_FILES = {
'identity': 'keystone_policy.json',
'compute': 'nova_policy.json',
+ 'network': 'neutron_policy.json',
'image': 'glance_policy.json',
'volume': 'cinder_policy.json'
}
diff --git a/horizon/files/horizon_settings/_local_settings.py b/horizon/files/horizon_settings/_local_settings.py
index 32b4779..f66e27a 100644
--- a/horizon/files/horizon_settings/_local_settings.py
+++ b/horizon/files/horizon_settings/_local_settings.py
@@ -204,3 +204,4 @@
{%- endif %}
SITE_BRANDING = '{{ app.get('branding', 'OpenStack Dashboard') }}'
+SESSION_COOKIE_HTTPONLY = {{ app.get('session_cookie_httponly', True) }}
diff --git a/horizon/map.jinja b/horizon/map.jinja
index a3a8fe6..0b0f65a 100644
--- a/horizon/map.jinja
+++ b/horizon/map.jinja
@@ -2,7 +2,7 @@
{% set server = salt['grains.filter_by']({
'Debian': {
- 'pkgs': ['apache2', dashboard_package, 'python-lesscpy', 'python-memcache', 'gettext-base'],
+ 'pkgs': ['apache2', 'libapache2-mod-wsgi', dashboard_package, 'python-lesscpy', 'python-memcache', 'gettext-base'],
'pkgs_multi': ['python-memcache', 'python-psycopg2', 'python-imaging',
'python-docutils', 'python-simplejson', 'build-essential',
'libxslt1-dev', 'libxml2-dev', 'libffi-dev', 'libssl-dev',