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/init.pp.orig 2016-04-21 08:11:23.146692638 -0700 |
5 --- openstack-horizon-8.2.0/manifests/init.pp.orig 2016-08-07 10:59:15.528518714 -0700 |
6 +++ openstack-horizon-6.1.0/manifests/init.pp 2016-04-21 08:11:37.446431463 -0700 |
6 +++ openstack-horizon-8.2.0/manifests/init.pp 2016-08-07 11:02:05.803099181 -0700 |
7 @@ -1,3 +1,7 @@ |
7 @@ -268,6 +268,25 @@ |
8 +####################################################################### |
8 # [*timezone*] |
9 +# Oracle has modified the originally distributed contents of this file. |
9 # (optional) The timezone of the server. |
10 +####################################################################### |
10 # Defaults to 'UTC'. |
11 + |
|
12 # == Class: horizon |
|
13 # |
|
14 # Installs Horizon dashboard with Apache |
|
15 @@ -201,6 +205,26 @@ |
|
16 # (optional) Tuskar-UI - Deployment mode ('poc' or 'scale') |
|
17 # Defaults to 'scale' |
|
18 # |
|
19 +# [*docroot*] |
11 +# [*docroot*] |
20 +# (optional) The DocumentRoot setting |
12 +# (optional) The DocumentRoot setting |
21 +# Defaults to '/var/www' |
13 +# Defaults to '/var/www' |
22 +# |
14 +# |
23 +# [*static_alias*] |
15 +# [*static_alias*] |
33 +# TEMPLATE_DIRS for theming. |
25 +# TEMPLATE_DIRS for theming. |
34 +# |
26 +# |
35 +# [*overrides*] |
27 +# [*overrides*] |
36 +# (optional) Python module to use for overrides |
28 +# (optional) Python module to use for overrides |
37 +# |
29 +# |
38 +# |
30 # |
39 # === Examples |
31 # === Examples |
40 # |
32 # |
41 # class { 'horizon': |
33 @@ -332,6 +351,11 @@ class horizon( |
42 @@ -251,6 +275,11 @@ |
34 $root_url = $::horizon::params::root_url, |
43 $tuskar_ui_ironic_discoverd_url = 'http://127.0.0.1:5050', |
35 $session_timeout = 1800, |
44 $tuskar_ui_undercloud_admin_password = undef, |
36 $timezone = 'UTC', |
45 $tuskar_ui_deployment_mode = 'scale', |
|
46 + $docroot = '/var/www', |
37 + $docroot = '/var/www', |
47 + $static_alias = '/usr/share/openstack-dashboard/static', |
38 + $static_alias = '/usr/share/openstack-dashboard/static', |
48 + $static_root = undef, |
39 + $static_root = undef, |
49 + $theme = undef, |
40 + $theme = undef, |
50 + $overrides = undef, |
41 + $overrides = undef, |
51 # DEPRECATED PARAMETERS |
42 # DEPRECATED PARAMETERS |
52 $can_set_mount_point = undef, |
43 $can_set_mount_point = undef, |
53 $vhost_extra_params = undef, |
44 $vhost_extra_params = undef, |
54 @@ -314,18 +343,16 @@ |
45 @@ -404,16 +428,18 @@ class horizon( |
55 order => '50', |
46 order => '50', |
56 } |
47 } |
57 |
48 |
58 - package { 'python-lesscpy': |
49 - exec { 'refresh_horizon_django_cache': |
59 - ensure => $package_ensure, |
50 - command => "${::horizon::params::manage_py} collectstatic --noinput --clear", |
|
51 - refreshonly => true, |
|
52 - require => Package['horizon'], |
60 - } |
53 - } |
61 - |
|
62 - exec { 'refresh_horizon_django_cache': |
|
63 - command => "${::horizon::params::manage_py} collectstatic --noinput --clear && ${::horizon::params::manage_py} compress --force", |
|
64 - refreshonly => true, |
|
65 - require => [Package['python-lesscpy'], Package['horizon']], |
|
66 + if $::horizon::params::manage_py { |
54 + if $::horizon::params::manage_py { |
67 + exec { 'refresh_horizon_django_cache': |
55 + exec { 'refresh_horizon_django_cache': |
68 + command => "${::horizon::params::manage_py} collectstatic --noinput --clear && ${::horizon::params::manage_py} compress --force", |
56 + command => "${::horizon::params::manage_py} collectstatic --noinput --clear", |
69 + refreshonly => true, |
57 + refreshonly => true, |
70 + require => [Package['python-lesscpy'], Package['horizon']], |
58 + require => Package['horizon'], |
|
59 + } |
|
60 |
|
61 - exec { 'refresh_horizon_django_compress': |
|
62 - command => "${::horizon::params::manage_py} compress --force", |
|
63 - refreshonly => true, |
|
64 - require => Package['horizon'], |
|
65 + exec { 'refresh_horizon_django_compress': |
|
66 + command => "${::horizon::params::manage_py} compress --force", |
|
67 + refreshonly => true, |
|
68 + require => Package['horizon'], |
71 + } |
69 + } |
72 } |
70 } |
73 |
71 |
74 - if $compress_offline { |
72 if $compress_offline { |
75 - Concat[$::horizon::params::config_file] ~> Exec['refresh_horizon_django_cache'] |
73 @@ -433,6 +459,8 @@ class horizon( |
76 + if $compress_offline and $::horizon::params::manage_py { |
|
77 + File[$::horizon::params::config_file] ~> Exec['refresh_horizon_django_cache'] |
|
78 } |
|
79 |
|
80 if $configure_apache { |
|
81 @@ -338,6 +365,8 @@ |
|
82 horizon_cert => $horizon_cert, |
74 horizon_cert => $horizon_cert, |
83 horizon_key => $horizon_key, |
75 horizon_key => $horizon_key, |
84 horizon_ca => $horizon_ca, |
76 horizon_ca => $horizon_ca, |
85 + docroot => $docroot, |
77 + docroot => $docroot, |
86 + static_alias => $static_alias, |
78 + static_alias => $static_alias, |
87 extra_params => $vhost_extra_params, |
79 extra_params => $vhost_extra_params, |
88 } |
80 redirect_type => $redirect_type, |
89 } |
81 root_url => $root_url |