components/ruby/puppet-modules/openstack-horizon/patches/03-init.patch
author Patrick Einheber <patrick.einheber@oracle.com>
Wed, 27 Apr 2016 14:55:10 -0700
changeset 5860 afd31ba91ee9
parent 5464 6e2e17e6aa45
child 6817 e4a26f447d0c
permissions -rw-r--r--
23146903 Puppet and OpenStack modules need modification notices
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5464
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     1
In-house patch to add support for Solaris 11.3 and 12.0.  This patch
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     2
has not yet been submitted upstream due to requirements for 3rd party
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     3
CI testing.
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     4
5860
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
     5
--- openstack-horizon-6.1.0/manifests/init.pp.orig	2016-04-21 08:11:23.146692638 -0700
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
     6
+++ openstack-horizon-6.1.0/manifests/init.pp	2016-04-21 08:11:37.446431463 -0700
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
     7
@@ -1,3 +1,7 @@
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
     8
+#######################################################################
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
     9
+# Oracle has modified the originally distributed contents of this file.
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
    10
+#######################################################################
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
    11
+
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
    12
 # == Class: horizon
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
    13
 #
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
    14
 # Installs Horizon dashboard with Apache
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
    15
@@ -201,6 +205,26 @@
5464
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    16
 #    (optional) Tuskar-UI - Deployment mode ('poc' or 'scale')
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    17
 #    Defaults to 'scale'
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    18
 #
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    19
+#  [*docroot*]
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    20
+#    (optional) The DocumentRoot setting
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    21
+#    Defaults to '/var/www'
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    22
+#
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    23
+#  [*static_alias*]
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    24
+#    (optional) The path to alias to /static
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    25
+#    Defaults to '/usr/share/openstack-dashboard/static'
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    26
+#
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    27
+#  [*static_root*]
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    28
+#    (optional) Absolute path to the directory in which static files
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    29
+#    should be collected
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    30
+#
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    31
+#  [*theme*]
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    32
+#    (optional) List of absolute paths which will be set as value of
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    33
+#    TEMPLATE_DIRS for theming.
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    34
+#
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    35
+#  [*overrides*]
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    36
+#    (optional) Python module to use for overrides
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    37
+#
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    38
+#
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    39
 # === Examples
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    40
 #
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    41
 #  class { 'horizon':
5860
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
    42
@@ -251,6 +275,11 @@
5464
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    43
   $tuskar_ui_ironic_discoverd_url      = 'http://127.0.0.1:5050',
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    44
   $tuskar_ui_undercloud_admin_password = undef,
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    45
   $tuskar_ui_deployment_mode           = 'scale',
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    46
+  $docroot                             = '/var/www',
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    47
+  $static_alias                        = '/usr/share/openstack-dashboard/static',
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    48
+  $static_root                         = undef,
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    49
+  $theme                               = undef,
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    50
+  $overrides                           = undef,
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    51
   # DEPRECATED PARAMETERS
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    52
   $can_set_mount_point                 = undef,
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    53
   $vhost_extra_params                  = undef,
5860
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
    54
@@ -314,18 +343,16 @@
5464
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    55
     order   => '50',
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    56
   }
5860
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
    57
 
5464
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    58
-  package { 'python-lesscpy':
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    59
-    ensure  => $package_ensure,
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    60
-  }
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    61
-
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    62
-  exec { 'refresh_horizon_django_cache':
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    63
-    command     => "${::horizon::params::manage_py} collectstatic --noinput --clear && ${::horizon::params::manage_py} compress --force",
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    64
-    refreshonly => true,
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    65
-    require     => [Package['python-lesscpy'], Package['horizon']],
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    66
+  if $::horizon::params::manage_py {
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    67
+    exec { 'refresh_horizon_django_cache':
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    68
+      command     => "${::horizon::params::manage_py} collectstatic --noinput --clear && ${::horizon::params::manage_py} compress --force",
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    69
+      refreshonly => true,
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    70
+      require     => [Package['python-lesscpy'], Package['horizon']],
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    71
+    }
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    72
   }
5860
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
    73
 
5464
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    74
-  if $compress_offline {
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    75
-    Concat[$::horizon::params::config_file] ~> Exec['refresh_horizon_django_cache']
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    76
+  if $compress_offline and $::horizon::params::manage_py {
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    77
+     File[$::horizon::params::config_file] ~> Exec['refresh_horizon_django_cache']
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    78
   }
5860
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
    79
 
5464
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    80
   if $configure_apache {
5860
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
    81
@@ -338,6 +365,8 @@
5464
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    82
       horizon_cert   => $horizon_cert,
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    83
       horizon_key    => $horizon_key,
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    84
       horizon_ca     => $horizon_ca,
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    85
+      docroot        => $docroot,
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    86
+      static_alias   => $static_alias,
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    87
       extra_params   => $vhost_extra_params,
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    88
     }
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    89
   }