components/ruby/puppet-modules/openstack-horizon/patches/03-init.patch
changeset 5464 6e2e17e6aa45
child 5860 afd31ba91ee9
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-horizon/patches/03-init.patch	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,81 @@
+In-house patch to add support for Solaris 11.3 and 12.0.  This patch
+has not yet been submitted upstream due to requirements for 3rd party
+CI testing.
+
+--- openstack-horizon-6.1.0/manifests/init.pp.orig     2015-08-10 09:54:19.189649729 -0700
++++ openstack-horizon-6.1.0/manifests/init.pp     2015-08-10 09:58:21.391326841 -0700
+@@ -201,6 +201,26 @@
+ #    (optional) Tuskar-UI - Deployment mode ('poc' or 'scale')
+ #    Defaults to 'scale'
+ #
++#  [*docroot*]
++#    (optional) The DocumentRoot setting
++#    Defaults to '/var/www'
++#
++#  [*static_alias*]
++#    (optional) The path to alias to /static
++#    Defaults to '/usr/share/openstack-dashboard/static'
++#
++#  [*static_root*]
++#    (optional) Absolute path to the directory in which static files
++#    should be collected
++#
++#  [*theme*]
++#    (optional) List of absolute paths which will be set as value of
++#    TEMPLATE_DIRS for theming.
++#
++#  [*overrides*]
++#    (optional) Python module to use for overrides
++#
++#
+ # === Examples
+ #
+ #  class { 'horizon':
+@@ -251,6 +271,11 @@ class horizon(
+   $tuskar_ui_ironic_discoverd_url      = 'http://127.0.0.1:5050',
+   $tuskar_ui_undercloud_admin_password = undef,
+   $tuskar_ui_deployment_mode           = 'scale',
++  $docroot                             = '/var/www',
++  $static_alias                        = '/usr/share/openstack-dashboard/static',
++  $static_root                         = undef,
++  $theme                               = undef,
++  $overrides                           = undef,
+   # DEPRECATED PARAMETERS
+   $can_set_mount_point                 = undef,
+   $vhost_extra_params                  = undef,
+@@ -314,18 +339,16 @@ class horizon(
+     order   => '50',
+   }
+
+-  package { 'python-lesscpy':
+-    ensure  => $package_ensure,
+-  }
+-
+-  exec { 'refresh_horizon_django_cache':
+-    command     => "${::horizon::params::manage_py} collectstatic --noinput --clear && ${::horizon::params::manage_py} compress --force",
+-    refreshonly => true,
+-    require     => [Package['python-lesscpy'], Package['horizon']],
++  if $::horizon::params::manage_py {
++    exec { 'refresh_horizon_django_cache':
++      command     => "${::horizon::params::manage_py} collectstatic --noinput --clear && ${::horizon::params::manage_py} compress --force",
++      refreshonly => true,
++      require     => [Package['python-lesscpy'], Package['horizon']],
++    }
+   }
+
+-  if $compress_offline {
+-    Concat[$::horizon::params::config_file] ~> Exec['refresh_horizon_django_cache']
++  if $compress_offline and $::horizon::params::manage_py {
++     File[$::horizon::params::config_file] ~> Exec['refresh_horizon_django_cache']
+   }
+
+   if $configure_apache {
+@@ -338,6 +361,8 @@ class horizon(
+       horizon_cert   => $horizon_cert,
+       horizon_key    => $horizon_key,
+       horizon_ca     => $horizon_ca,
++      docroot        => $docroot,
++      static_alias   => $static_alias,
+       extra_params   => $vhost_extra_params,
+     }
+   }