meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppet-horizon/0002-puppet-horizon-changes-for-poky-stx.patch

   1 diff -ru a/manifests/params.pp b/manifests/params.pp
   2 --- a/manifests/params.pp       2020-04-13 18:34:56.702263928 +0800
   3 +++ b/manifests/params.pp       2020-04-13 18:36:23.158266284 +0800
   4 @@ -32,17 +32,27 @@
   5        $static_path                 = '/var/lib'
   6        $apache_user                 = 'www-data'
   7        $apache_group                = 'www-data'
   8 -      $wsgi_user                   = 'horizon'
   9 -      $wsgi_group                  = 'horizon'
  10 -      $memcache_package            = 'python-memcache'
  11        case $::os_package_type {
  12          'debian': {
  13              $package_name          = 'openstack-dashboard-apache'
  14              $httpd_config_file     = '/etc/apache2/sites-available/openstack-dashboard-alias-only.conf'
  15 +            $memcache_package      = 'python-memcache'
  16 +            $wsgi_user             = 'horizon'
  17 +            $wsgi_group            = 'horizon'
  18 +        }
  19 +        'poky': {
  20 +            $package_name          = 'python-django-horizon'
  21 +            $httpd_config_file     = '/etc/httpd/conf.d/openstack-dashboard.conf'
  22 +            $memcache_package      = 'python-memcached'
  23 +            $wsgi_user             = 'apache'
  24 +            $wsgi_group            = 'apache'
  25          }
  26          default: {
  27              $package_name          = 'openstack-dashboard'
  28              $httpd_config_file     = '/etc/apache2/conf-available/openstack-dashboard.conf'
  29 +            $memcache_package      = 'python-memcache'
  30 +            $wsgi_user             = 'horizon'
  31 +            $wsgi_group            = 'horizon'
  32          }
  33        }
  34      }