|
1 In-house patch to add support for Solaris 11.3 and 12.0. This patch |
|
2 has not yet been submitted upstream due to requirements for 3rd party |
|
3 CI testing. |
|
4 |
|
5 --- openstack-horizon-6.1.0/templates/local_settings.py.erb.orig 2015-06-04 08:58:10.806056356 -0600 |
|
6 +++ openstack-horizon-6.1.0/templates/local_settings.py.erb 2015-06-04 08:57:59.128875035 -0600 |
|
7 @@ -76,6 +76,9 @@ HORIZON_CONFIG = { |
|
8 'exceptions': {'recoverable': exceptions.RECOVERABLE, |
|
9 'not_found': exceptions.NOT_FOUND, |
|
10 'unauthorized': exceptions.UNAUTHORIZED}, |
|
11 +<% if @overrides %> |
|
12 + 'customization_module': "<%= @overrides %>" |
|
13 +<% end %> |
|
14 } |
|
15 |
|
16 # Specify a regular expression to validate user passwords. |
|
17 @@ -345,13 +348,6 @@ LOGGING = { |
|
18 'filename': '<%= scope.lookupvar("horizon::params::logdir") %>/horizon.log', |
|
19 'formatter': 'verbose', |
|
20 }, |
|
21 - 'syslog': { |
|
22 - 'level': '<%= @log_level %>', |
|
23 - 'facility': 'local1', |
|
24 - 'class': 'logging.handlers.SysLogHandler', |
|
25 - 'address': '/dev/log', |
|
26 - 'formatter': 'normal', |
|
27 - } |
|
28 }, |
|
29 'loggers': { |
|
30 # Logging from django.db.backends is VERY verbose, send to null |
|
31 @@ -574,14 +570,27 @@ LOGIN_URL = '<%= scope.lookupvar("horizo |
|
32 LOGOUT_URL = '<%= scope.lookupvar("horizon::params::root_url") %>/auth/logout/' |
|
33 LOGIN_REDIRECT_URL = '<%= scope.lookupvar("horizon::params::root_url") %>' |
|
34 |
|
35 -# The Ubuntu package includes pre-compressed JS and compiled CSS to allow |
|
36 -# offline compression by default. To enable online compression, install |
|
37 -# the python-lesscpy package and disable the following option. |
|
38 +<% if @static_root %> |
|
39 +STATIC_ROOT = '<%= @static_root %>' |
|
40 +<% end %> |
|
41 + |
|
42 +<% if @theme %> |
|
43 + <% if @theme.kind_of?(Array) %> |
|
44 +TEMPLATE_DIRS = ('<%= @theme.join("', '") %>', ) |
|
45 + <% else %> |
|
46 +TEMPLATE_DIRS = ('<%= @theme %>', ) |
|
47 + <% end %> |
|
48 +<% end %> |
|
49 + |
|
50 +# The Ubuntu and Solaris packages includes pre-compressed JS and |
|
51 +# compiled CSS to allow offline compression by default. To enable |
|
52 +# online compression, install the python-lesscpy package and disable |
|
53 +# the following option. |
|
54 COMPRESS_OFFLINE = <%= @compress_offline.to_s.capitalize %> |
|
55 |
|
56 -# For Glance image upload, Horizon uses the file upload support from Django |
|
57 -# so we add this option to change the directory where uploaded files are temporarily |
|
58 -# stored until they are loaded into Glance. |
|
59 +# For Glance image upload, Horizon uses the file upload support from |
|
60 +# Django so we add this option to change the directory where uploaded |
|
61 +# files are temporarily stored until they are loaded into Glance. |
|
62 FILE_UPLOAD_TEMP_DIR = '<%= @file_upload_temp_dir %>' |
|
63 |
|
64 <% if @tuskar_ui %> |