components/ruby/puppet-modules/openstack-horizon/patches/04-template.patch
changeset 6817 e4a26f447d0c
parent 5860 afd31ba91ee9
equal deleted inserted replaced
6816:bb11bcf4ebf8 6817:e4a26f447d0c
     8 +#######################################################################
     8 +#######################################################################
     9 +# Oracle has modified the originally distributed contents of this file.
     9 +# Oracle has modified the originally distributed contents of this file.
    10 +#######################################################################
    10 +#######################################################################
    11 +
    11 +
    12  import os
    12  import os
    13  
    13 
    14  from django.utils.translation import ugettext_lazy as _
    14  from django.utils.translation import ugettext_lazy as _
    15 @@ -76,6 +80,9 @@
    15 @@ -108,6 +112,9 @@ HORIZON_CONFIG = {
    16      'exceptions': {'recoverable': exceptions.RECOVERABLE,
    16      'exceptions': {'recoverable': exceptions.RECOVERABLE,
    17                     'not_found': exceptions.NOT_FOUND,
    17                     'not_found': exceptions.NOT_FOUND,
    18                     'unauthorized': exceptions.UNAUTHORIZED},
    18                     'unauthorized': exceptions.UNAUTHORIZED},
    19 +<% if @overrides %>
    19 +<% if @overrides %>
    20 +    'customization_module': "<%= @overrides %>"
    20 +    'customization_module': "<%= @overrides %>"
    21 +<% end %>
    21 +<% end %>
    22  }
    22  }
    23  
    23 
    24  # Specify a regular expression to validate user passwords.
    24  # If provided, a "Report Bug" link will be displayed in the site header
    25 @@ -345,13 +352,6 @@
    25 @@ -616,7 +623,6 @@ LOGGING = {
    26              'filename': '<%= scope.lookupvar("horizon::params::logdir") %>/horizon.log',
    26              'level': '<%= @log_level %>',
    27              'formatter': 'verbose',
    27              'facility': 'local1',
    28          },
    28              'class': 'logging.handlers.SysLogHandler',
    29 -        'syslog': {
       
    30 -            'level': '<%= @log_level %>',
       
    31 -            'facility': 'local1',
       
    32 -            'class': 'logging.handlers.SysLogHandler',
       
    33 -            'address': '/dev/log',
    29 -            'address': '/dev/log',
    34 -            'formatter': 'normal',
    30              'formatter': 'normal',
    35 -        }
    31          }
    36      },
    32      },
    37      'loggers': {
    33 @@ -841,14 +847,27 @@ SECURITY_GROUP_RULES = {
    38          # Logging from django.db.backends is VERY verbose, send to null
    34 
    39 @@ -574,14 +574,27 @@
    35  SESSION_TIMEOUT = <%= @session_timeout %>
    40  LOGOUT_URL = '<%= scope.lookupvar("horizon::params::root_url") %>/auth/logout/'
    36 
    41  LOGIN_REDIRECT_URL = '<%= scope.lookupvar("horizon::params::root_url") %>'
       
    42  
       
    43 -# The Ubuntu package includes pre-compressed JS and compiled CSS to allow
    37 -# The Ubuntu package includes pre-compressed JS and compiled CSS to allow
    44 -# offline compression by default.  To enable online compression, install
    38 -# offline compression by default.  To enable online compression, install
    45 -# the python-lesscpy package and disable the following option.
    39 -# the python-lesscpy package and disable the following option.
    46 +<% if @static_root %>
    40 +<% if @static_root %>
    47 +STATIC_ROOT = '<%= @static_root %>'
    41 +STATIC_ROOT = '<%= @static_root %>'
    58 +# The Ubuntu and Solaris packages includes pre-compressed JS and
    52 +# The Ubuntu and Solaris packages includes pre-compressed JS and
    59 +# compiled CSS to allow offline compression by default.  To enable
    53 +# compiled CSS to allow offline compression by default.  To enable
    60 +# online compression, install the python-lesscpy package and disable
    54 +# online compression, install the python-lesscpy package and disable
    61 +# the following option.
    55 +# the following option.
    62  COMPRESS_OFFLINE = <%= @compress_offline.to_s.capitalize %>
    56  COMPRESS_OFFLINE = <%= @compress_offline.to_s.capitalize %>
    63  
    57 
    64 -# For Glance image upload, Horizon uses the file upload support from Django
    58 -# For Glance image upload, Horizon uses the file upload support from Django
    65 -# so we add this option to change the directory where uploaded files are temporarily
    59 -# so we add this option to change the directory where uploaded files are temporarily
    66 -# stored until they are loaded into Glance.
    60 -# stored until they are loaded into Glance.
    67 +# For Glance image upload, Horizon uses the file upload support from
    61 +# For Glance image upload, Horizon uses the file upload support from
    68 +# Django so we add this option to change the directory where uploaded
    62 +# Django so we add this option to change the directory where uploaded
    69 +# files are temporarily stored until they are loaded into Glance.
    63 +# files are temporarily stored until they are loaded into Glance.
    70  FILE_UPLOAD_TEMP_DIR = '<%= @file_upload_temp_dir %>'
    64  FILE_UPLOAD_TEMP_DIR = '<%= @file_upload_temp_dir %>'
    71  
    65 
    72  <% if @tuskar_ui %>
    66  <% if @tuskar_ui %>