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/manifests/params.pp.orig	2015-04-23 15:14:49.613879625 -0600

     6 +++ openstack-horizon-6.1.0/manifests/params.pp	2015-04-23 15:18:41.786048628 -0600

     7 @@ -2,12 +2,11 @@

     8  # should be considered to be constant

     9  class horizon::params {

    10 

    11 -  $logdir      = '/var/log/horizon'

    12 -  $django_wsgi = '/usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi'

    13 -  $manage_py   = '/usr/share/openstack-dashboard/manage.py'

    14 -

    15    case $::osfamily {

    16      'RedHat': {

    17 +      $logdir                      = '/var/log/horizon'

    18 +      $django_wsgi                 = '/usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi'

    19 +      $manage_py                   = '/usr/share/openstack-dashboard/manage.py'

    20        $http_service                = 'httpd'

    21        $http_modwsgi                = 'mod_wsgi'

    22        $package_name                = 'openstack-dashboard'

    23 @@ -21,6 +20,9 @@ class horizon::params {

    24        $wsgi_group                  = 'dashboard'

    25      }

    26      'Debian': {

    27 +      $logdir                      = '/var/log/horizon'

    28 +      $django_wsgi                 = '/usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi'

    29 +      $manage_py                   = '/usr/share/openstack-dashboard/manage.py'

    30        $http_service                = 'apache2'

    31        $config_file                 = '/etc/openstack-dashboard/local_settings.py'

    32        $httpd_listen_config_file    = '/etc/apache2/ports.conf'

    33 @@ -40,8 +42,23 @@ class horizon::params {

    34          }

    35        }

    36      }

    37 +    'Solaris': {

    38 +      $logdir                      = '/var/lib/openstack_dashboard'

    39 +      $django_wsgi                 = '/usr/lib/python2.7/vendor-packages/openstack_dashboard/wsgi/django.wsgi'

    40 +      $manage_py                   = undef

    41 +      $http_service                = 'network/http:apache24'

    42 +      $config_file                 = '/etc/openstack_dashboard/local_settings.py'

    43 +      $httpd_config_file           = '/etc/apache2/2.4/samples-conf.d/openstack-dashboard-http.conf'

    44 +      $httpd_listen_config_file    = '/etc/apache2/2.4/httpd.conf'

    45 +      $root_url                    = '/horizon'

    46 +      $apache_user                 = 'webservd'

    47 +      $apache_group                = 'webservd'

    48 +      $wsgi_user                   = 'webservd'

    49 +      $wsgi_group                  = 'webservd'

    50 +      $package_name                = 'cloud/openstack/horizon'

    51 +    }

    52      default: {

    53 -      fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, module ${module_name} only support osfamily RedHat and Debian")

    54 +      fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, module ${module_name} only support osfamily Solaris, RedHat, and Debian")

    55      }

    56    }

    57  }