Update horizon to e0fd95a693db6f1b2196c6497f999164b292d369

e0fd95a693db6f1b2196c6497f999164b292d369 Fix spec tests for RSpec 3.x and Puppet 4.x
bce96510a0cf95dd44727c3872528207dd9a0cb7 Merge "Collect static files before compressing them"
e7b5313d610f9be68d16e33f379b99c5b9717252 Bump rspec-puppet to 2.1.0
64ebe7aae84bb75185db4c74bfc84649b04784f6 Collect static files before compressing them

Change-Id: I91f41541734093669243c94618d914e07237550c

Puppetfile

@@ -63,7 +63,7 @@ mod 'heat',
   :git => 'https://github.com/stackforge/puppet-heat.git'
 
 mod 'horizon',
-  :commit => '78610f93b41698401af0ffb9f0f9207e7c23b17a',
+  :commit => 'e0fd95a693db6f1b2196c6497f999164b292d369',
   :git => 'https://github.com/stackforge/puppet-horizon.git'
 
 mod 'inifile',

horizon/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 group :development, :test do
   gem 'puppetlabs_spec_helper', :require => false
-  gem 'rspec-puppet', '~> 2.0.0', :require => false
+  gem 'rspec-puppet', '~> 2.1.0', :require => false
 
   gem 'puppet-lint', '~> 1.1.0'
   gem 'metadata-json-lint'

horizon/manifests/init.pp

@@ -294,7 +294,7 @@
   }
 
   exec { 'refresh_horizon_django_cache':
-    command     => "${::horizon::params::manage_py} compress",
+    command     => "${::horizon::params::manage_py} collectstatic --noinput --clear && ${::horizon::params::manage_py} compress --force",
     refreshonly => true,
     require     => [Package['python-lesscpy'], Package['horizon']],
   }

horizon/spec/classes/horizon_init_spec.rb

@@ -32,7 +32,7 @@
           )
       }
       it { is_expected.to contain_exec('refresh_horizon_django_cache').with({
-          :command     => '/usr/share/openstack-dashboard/manage.py compress',
+          :command     => '/usr/share/openstack-dashboard/manage.py collectstatic --noinput --clear && /usr/share/openstack-dashboard/manage.py compress --force',
           :refreshonly => true,
       })}
       it { is_expected.to contain_concat(platforms_params[:config_file]).that_notifies('Exec[refresh_horizon_django_cache]') }

horizon/spec/classes/horizon_wsgi_apache_spec.rb

@@ -40,7 +40,7 @@
           'access_log_file'      => 'horizon_access.log',
           'error_log_file'       => 'horizon_error.log',
           'priority'             => '15',
-          'serveraliases'        => '*',
+          'serveraliases'        => ['*'],
           'docroot'              => '/var/www/',
           'ssl'                  => 'false',
           'redirectmatch_status' => 'permanent',
@@ -73,7 +73,7 @@
           'access_log_file'      => 'horizon_access.log',
           'error_log_file'       => 'horizon_error.log',
           'priority'             => params[:priority],
-          'serveraliases'        => '*',
+          'serveraliases'        => ['*'],
           'docroot'              => '/var/www/',
           'ssl'                  => 'false',
           'redirectmatch_status' => 'permanent',
@@ -107,7 +107,7 @@
           'access_log_file'        => 'horizon_ssl_access.log',
           'error_log_file'         => 'horizon_ssl_error.log',
           'priority'               => '15',
-          'serveraliases'          => '*',
+          'serveraliases'          => ['*'],
           'docroot'                => '/var/www/',
           'ssl'                    => 'true',
           'ssl_cert'               => '/etc/pki/tls/certs/httpd.crt',
@@ -126,7 +126,7 @@
           'access_log_file'      => 'horizon_access.log',
           'error_log_file'       => 'horizon_error.log',
           'priority'             => '15',
-          'serveraliases'        => '*',
+          'serveraliases'        => ['*'],
           'docroot'              => '/var/www/',
           'ssl'                  => 'false',
           'redirectmatch_status' => 'permanent',