Update horizon to 168c206dfefa35abec48d7bce33ed469bf98cefb

168c206dfefa35abec48d7bce33ed469bf98cefb Merge "Release 5.0.0 - Juno"
512ff352eb4dbdc01cd40529b9ca9ea7e5b1db7c Update horzion::wsgi::apache for new apache module
c4ba7a3c4cc42391b764724a8f95c94e86eabc06 Release 5.0.0 - Juno

Author: xbezdick

Puppetfile

@@ -51,7 +51,7 @@ mod 'heat',
   :git => 'https://github.com/stackforge/puppet-heat.git'
 
 mod 'horizon',
-  :commit => '353c372d582167d5635b1b2ee9474cf6822db032',
+  :commit => '168c206dfefa35abec48d7bce33ed469bf98cefb',
   :git => 'https://github.com/stackforge/puppet-horizon.git'
 
 mod 'inifile',

horizon/README.md

@@ -1,7 +1,7 @@
 horizon
 =======
 
-4.0.0 - 2014.1.0 - Icehouse
+5.0.0 - 2014.2.0 - Juno
 
 #### Table of Contents
 
@@ -87,6 +87,33 @@ Contributors
 Release Notes
 -------------
 
+**5.0.0**
+
+* Stable Juno release
+* Fixed the default value of compress_offline parameter
+* Always manages local_settings.py
+* Added parameters to configure policy files in horizon class
+* Fixed Apache config file default
+* Added parameter django_session_engine to horizon class
+* Stops setting wsgi_socket_prefix since the apache module takes care of it
+* Adds workaround for puppet's handling of undef for setting the vhost bind address
+* Changes cache_server_ip in horizon class to accept arrays
+* Switched the default log level to INFO from DEBUG
+* Fixed the default MSSQL port in security group rules
+
+**4.2.0**
+
+* Added parameters to configure ALLOWED_HOSTS in settings_local.y and
+  ServerAlias in apache, no longer requiring these values to be the fqdn
+* Fixed removal of vhost conf file
+* Added support for secure cookies
+
+**4.1.0**
+
+* Added option to set temporary upload directory for images.
+* Ensure ssl wsgi_process_group is the same as wsgi_daemon_process.
+* Pined major gems.
+
 **4.0.0**
 
 * Stable Icehouse release.

horizon/manifests/wsgi/apache.pp

@@ -180,7 +180,8 @@
   }
 
   ensure_resource('apache::vhost', $vhost_conf_name, merge ($default_vhost_conf, $extra_params, {
-    redirectmatch_regexp => "${redirect_match} ${redirect_url}",
+    redirectmatch_regexp => $redirect_match,
+    redirectmatch_dest   => $redirect_url,
   }))
   ensure_resource('apache::vhost', $vhost_ssl_conf_name, merge ($default_vhost_conf, $extra_params, {
     access_log_file      => 'horizon_ssl_access.log',
@@ -191,7 +192,8 @@
     ensure               => $ensure_ssl_vhost,
     wsgi_daemon_process  => 'horizon-ssl',
     wsgi_process_group   => 'horizon-ssl',
-    redirectmatch_regexp => "^/$ ${::horizon::params::root_url}"
+    redirectmatch_regexp => '^/$',
+    redirectmatch_dest   => $::horizon::params::root_url,
   }))
 
 }

horizon/metadata.json

@@ -31,7 +31,7 @@
   ],
   "description": "Installs and configures OpenStack Horizon (Dashboard).",
   "dependencies": [
-    { "name": "puppetlabs/apache", "version_requirement": ">=1.1.2 <2.0.0" },
+    { "name": "puppetlabs/apache", "version_requirement": ">=1.2.0 <2.0.0" },
     { "name": "puppetlabs/stdlib", "version_requirement": ">=4.0.0 <5.0.0" },
     { "name": "saz/memcached", "version_requirement": ">=2.0.2 <3.0.0" }
   ]

horizon/spec/classes/horizon_wsgi_apache_spec.rb

@@ -44,7 +44,8 @@
           'docroot'              => '/var/www/',
           'ssl'                  => 'false',
           'redirectmatch_status' => 'permanent',
-          'redirectmatch_regexp' => "^/$ #{platforms_params[:root_url]}",
+          'redirectmatch_regexp' => '^/$',
+          'redirectmatch_dest'   => platforms_params[:root_url],
           'wsgi_script_aliases'  => { platforms_params[:root_url] => '/usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi' },
           'wsgi_process_group'   => platforms_params[:wsgi_group],
           'wsgi_daemon_process'  => platforms_params[:wsgi_group],
@@ -76,7 +77,8 @@
           'docroot'              => '/var/www/',
           'ssl'                  => 'false',
           'redirectmatch_status' => 'permanent',
-          'redirectmatch_regexp' => "^/$ #{platforms_params[:root_url]}",
+          'redirectmatch_regexp' => '^/$',
+          'redirectmatch_dest'   => platforms_params[:root_url],
           'wsgi_script_aliases'  => { platforms_params[:root_url] => '/usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi' },
           'wsgi_process_group'   => platforms_params[:wsgi_group],
           'wsgi_daemon_process'  => platforms_params[:wsgi_group],
@@ -112,7 +114,8 @@
           'ssl_key'                => '/etc/pki/tls/private/httpd.key',
           'ssl_ca'                 => '/etc/pki/tls/certs/ca.crt',
           'redirectmatch_status'   => 'permanent',
-          'redirectmatch_regexp'   => "^/$ #{platforms_params[:root_url]}",
+          'redirectmatch_regexp'   => '^/$',
+          'redirectmatch_dest'     => platforms_params[:root_url],
           'wsgi_process_group'     => 'horizon-ssl',
           'wsgi_daemon_process'    => 'horizon-ssl',
           'wsgi_script_aliases'    => { platforms_params[:root_url] => '/usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi' }
@@ -127,7 +130,8 @@
           'docroot'              => '/var/www/',
           'ssl'                  => 'false',
           'redirectmatch_status' => 'permanent',
-          'redirectmatch_regexp' => '(.*) https://some.host.tld',
+          'redirectmatch_regexp' => '(.*)',
+          'redirectmatch_dest'   => 'https://some.host.tld',
           'wsgi_process_group'   => platforms_params[:wsgi_group],
           'wsgi_daemon_process'  => platforms_params[:wsgi_group],
           'wsgi_script_aliases'  => { platforms_params[:root_url] => '/usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi' }