--- a/components/ruby/puppet-modules/openstack-horizon/patches/04-template.patch Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-horizon/patches/04-template.patch Wed Apr 27 14:55:10 2016 -0700
@@ -2,9 +2,17 @@
has not yet been submitted upstream due to requirements for 3rd party
CI testing.
---- openstack-horizon-6.1.0/templates/local_settings.py.erb.orig 2015-06-04 08:58:10.806056356 -0600
-+++ openstack-horizon-6.1.0/templates/local_settings.py.erb 2015-06-04 08:57:59.128875035 -0600
-@@ -76,6 +76,9 @@ HORIZON_CONFIG = {
+--- openstack-horizon-6.1.0/templates/local_settings.py.erb.orig 2016-04-21 08:12:26.145429656 -0700
++++ openstack-horizon-6.1.0/templates/local_settings.py.erb 2016-04-21 08:12:49.285218471 -0700
+@@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ import os
+
+ from django.utils.translation import ugettext_lazy as _
+@@ -76,6 +80,9 @@
'exceptions': {'recoverable': exceptions.RECOVERABLE,
'not_found': exceptions.NOT_FOUND,
'unauthorized': exceptions.UNAUTHORIZED},
@@ -12,9 +20,9 @@
+ 'customization_module': "<%= @overrides %>"
+<% end %>
}
-
+
# Specify a regular expression to validate user passwords.
-@@ -345,13 +348,6 @@ LOGGING = {
+@@ -345,13 +352,6 @@
'filename': '<%= scope.lookupvar("horizon::params::logdir") %>/horizon.log',
'formatter': 'verbose',
},
@@ -28,10 +36,10 @@
},
'loggers': {
# Logging from django.db.backends is VERY verbose, send to null
-@@ -574,14 +570,27 @@ LOGIN_URL = '<%= scope.lookupvar("horizo
+@@ -574,14 +574,27 @@
LOGOUT_URL = '<%= scope.lookupvar("horizon::params::root_url") %>/auth/logout/'
LOGIN_REDIRECT_URL = '<%= scope.lookupvar("horizon::params::root_url") %>'
-
+
-# The Ubuntu package includes pre-compressed JS and compiled CSS to allow
-# offline compression by default. To enable online compression, install
-# the python-lesscpy package and disable the following option.
@@ -52,7 +60,7 @@
+# online compression, install the python-lesscpy package and disable
+# the following option.
COMPRESS_OFFLINE = <%= @compress_offline.to_s.capitalize %>
-
+
-# For Glance image upload, Horizon uses the file upload support from Django
-# so we add this option to change the directory where uploaded files are temporarily
-# stored until they are loaded into Glance.
@@ -60,5 +68,5 @@
+# Django so we add this option to change the directory where uploaded
+# files are temporarily stored until they are loaded into Glance.
FILE_UPLOAD_TEMP_DIR = '<%= @file_upload_temp_dir %>'
-
+
<% if @tuskar_ui %>