1 In-house patch to add support for Solaris 11.3 and 12.0. This patch |
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 |
2 has not yet been submitted upstream due to requirements for 3rd party |
3 CI testing. |
3 CI testing. |
4 |
4 |
5 --- openstack-horizon-6.1.0/manifests/params.pp.orig 2015-04-23 15:14:49.613879625 -0600 |
5 --- openstack-horizon-6.1.0/manifests/params.pp.orig 2016-04-21 08:10:05.499663309 -0700 |
6 +++ openstack-horizon-6.1.0/manifests/params.pp 2015-04-23 15:18:41.786048628 -0600 |
6 +++ openstack-horizon-6.1.0/manifests/params.pp 2016-04-21 08:10:35.317952119 -0700 |
7 @@ -2,12 +2,11 @@ |
7 @@ -1,13 +1,16 @@ |
|
8 +####################################################################### |
|
9 +# Oracle has modified the originally distributed contents of this file. |
|
10 +####################################################################### |
|
11 + |
|
12 # these parameters need to be accessed from several locations and |
8 # should be considered to be constant |
13 # should be considered to be constant |
9 class horizon::params { |
14 class horizon::params { |
10 |
15 |
11 - $logdir = '/var/log/horizon' |
16 - $logdir = '/var/log/horizon' |
12 - $django_wsgi = '/usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi' |
17 - $django_wsgi = '/usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi' |
13 - $manage_py = '/usr/share/openstack-dashboard/manage.py' |
18 - $manage_py = '/usr/share/openstack-dashboard/manage.py' |
14 - |
19 - |
15 case $::osfamily { |
20 case $::osfamily { |
18 + $django_wsgi = '/usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi' |
23 + $django_wsgi = '/usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi' |
19 + $manage_py = '/usr/share/openstack-dashboard/manage.py' |
24 + $manage_py = '/usr/share/openstack-dashboard/manage.py' |
20 $http_service = 'httpd' |
25 $http_service = 'httpd' |
21 $http_modwsgi = 'mod_wsgi' |
26 $http_modwsgi = 'mod_wsgi' |
22 $package_name = 'openstack-dashboard' |
27 $package_name = 'openstack-dashboard' |
23 @@ -21,6 +20,9 @@ class horizon::params { |
28 @@ -21,6 +24,9 @@ |
24 $wsgi_group = 'dashboard' |
29 $wsgi_group = 'dashboard' |
25 } |
30 } |
26 'Debian': { |
31 'Debian': { |
27 + $logdir = '/var/log/horizon' |
32 + $logdir = '/var/log/horizon' |
28 + $django_wsgi = '/usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi' |
33 + $django_wsgi = '/usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi' |
29 + $manage_py = '/usr/share/openstack-dashboard/manage.py' |
34 + $manage_py = '/usr/share/openstack-dashboard/manage.py' |
30 $http_service = 'apache2' |
35 $http_service = 'apache2' |
31 $config_file = '/etc/openstack-dashboard/local_settings.py' |
36 $config_file = '/etc/openstack-dashboard/local_settings.py' |
32 $httpd_listen_config_file = '/etc/apache2/ports.conf' |
37 $httpd_listen_config_file = '/etc/apache2/ports.conf' |
33 @@ -40,8 +42,23 @@ class horizon::params { |
38 @@ -40,8 +46,23 @@ |
34 } |
39 } |
35 } |
40 } |
36 } |
41 } |
37 + 'Solaris': { |
42 + 'Solaris': { |
38 + $logdir = '/var/lib/openstack_dashboard' |
43 + $logdir = '/var/lib/openstack_dashboard' |